gNOI Cold Reboot - Integrated tests

sonic-net · Nov 21, 2024 · 02b4273 · 02b4273
1 parent d6d5a19
commit 02b4273
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 194 deletions.
diff --git a/src/sonic-framework/rebootbackend/Makefile.am b/src/sonic-framework/rebootbackend/Makefile.am
@@ -10,8 +10,7 @@ DBGFLAGS = -g
 endif
 
 rebootbackend_SOURCES = rebootbackend.cpp rebootbe.cpp interfaces.cpp \
-                        reboot_thread.cpp redis_utils.cpp \
-                        reboot_common.cpp \
+                        reboot_thread.cpp  \
                         system/system.pb.cc types/types.pb.cc \
                         common/common.pb.cc 
 

diff --git a/src/sonic-framework/rebootbackend/interfaces.cpp b/src/sonic-framework/rebootbackend/interfaces.cpp
@@ -13,8 +13,8 @@ constexpr char kContainerShutdownPath[] = "/org/SONiC/HostService/gnoi_container
 
 // DBus::BusDispatcher dispatcher;
 DBus::Connection& HostServiceDbus::getConnection(void) {
-  static DBus::Connection* ConnPtr = nullptr;
-  if (ConnPtr == nullptr) {
+  static DBus::Connection* connPtr = nullptr;
+  if (connPtr == nullptr) {
     static DBus::BusDispatcher dispatcher;
     DBus::default_dispatcher = &dispatcher;
 

diff --git a/src/sonic-framework/rebootbackend/reboot_common.h b/src/sonic-framework/rebootbackend/reboot_common.h
@@ -6,9 +6,7 @@
 
 namespace rebootbackend {
 
-//extern bool sigterm_requested;
-bool sigterm_requested = false;
-
+extern bool sigterm_requested;
 struct NotificationResponse {
   swss::StatusCode status;
   std::string json_string;

diff --git a/src/sonic-framework/rebootbackend/reboot_thread.cpp b/src/sonic-framework/rebootbackend/reboot_thread.cpp
@@ -6,7 +6,6 @@
 #include "notificationproducer.h"
 #include "reboot_common.h"
 #include "reboot_interfaces.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "selectabletimer.h"
@@ -19,10 +18,10 @@ namespace rebootbackend {
 using namespace ::gnoi::system;
 using steady_clock = std::chrono::steady_clock;
 using Progress = ::rebootbackend::RebootThread::Progress;
-//using WarmBootStage = ::swss::WarmStart::WarmBootStage;
-using WarmStartState = ::swss::WarmStart::WarmStartState;
 namespace gpu = ::google::protobuf::util;
 
+bool sigterm_requested = false;
+
 RebootThread::RebootThread(DbusInterface &dbus_interface,
                            swss::SelectableEvent &m_finished)
     : m_db("STATE_DB", 0),

diff --git a/src/sonic-framework/rebootbackend/reboot_thread.h b/src/sonic-framework/rebootbackend/reboot_thread.h
@@ -8,7 +8,6 @@
 #include "notificationproducer.h"
 #include "reboot_common.h"
 #include "reboot_interfaces.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "selectabletimer.h"

diff --git a/src/sonic-framework/rebootbackend/rebootbackend.cpp b/src/sonic-framework/rebootbackend/rebootbackend.cpp
@@ -2,12 +2,9 @@
 #include "reboot_interfaces.h"
 #include "rebootbe.h"
 
-using namespace ::rebootbackend::HostServiceDbus;
-using namespace ::rebootbackend::RebootBE;
-
 int main(int argc, char** argv) {
   HostServiceDbus dbus_interface;
-  RebootBE rebootbe(dbus_interface);
+  ::rebootbackend::RebootBE rebootbe(dbus_interface);
   rebootbe.Start();
   return 0;
 }
diff --git a/src/sonic-framework/rebootbackend/rebootbe.cpp b/src/sonic-framework/rebootbackend/rebootbe.cpp
@@ -42,10 +42,6 @@ void RebootBE::Start() {
   SWSS_LOG_ENTER();
   SWSS_LOG_NOTICE("--- Starting rebootbackend ---");
 
-  swss::WarmStart::initialize("rebootbackend", "sonic-framework");
-  swss::WarmStart::checkWarmStart("rebootbackend", "sonic-framework",
-                                  /*incr_restore_cnt=*/false);
-
   swss::Select s;
   s.addSelectable(&m_NotificationConsumer);
   s.addSelectable(&m_Done);
@@ -85,15 +81,15 @@ bool RebootBE::RetrieveNotificationData(
   SWSS_LOG_ENTER();
 
   request.op = "";
-  request.ret_string = "";
+  request.retString = "";
 
   std::string data;
   std::vector<swss::FieldValueTuple> values;
   consumer.pop(request.op, data, values);
 
   for (auto &fv : values) {
     if (DATA_TUPLE_KEY == fvField(fv)) {
-      request.ret_string = fvValue(fv);
+      request.retString = fvValue(fv);
       return true;
     }
   }
@@ -118,8 +114,7 @@ void RebootBE::SendNotificationResponse(const std::string key,
 
 NotificationResponse RebootBE::HandleRebootRequest(
     const std::string &jsonRebootRequest) {
-//  using namespace google::protobuf::util;
-  using namespace gpu::;
+    using namespace gpu;
 
   SWSS_LOG_ENTER();
 

diff --git a/src/sonic-framework/rebootbackend/rebootbe.h b/src/sonic-framework/rebootbackend/rebootbe.h
@@ -10,12 +10,12 @@
 
 namespace rebootbackend {
 
-#define REBOOT_REQUEST_NOTIFICATION_CHANNEL "Reboot_Request_Channel"
-#define REBOOT_RESPONSE_NOTIFICATION_CHANNEL "Reboot_Response_Channel"
-#define REBOOT_KEY "Reboot"
-#define REBOOT_STATUS_KEY "RebootStatus"
-#define CANCEL_REBOOT_KEY "CancelReboot"
-#define DATA_TUPLE_KEY "MESSAGE" 
+constexpr char REBOOT_REQUEST_NOTIFICATION_CHANNEL[] = "Reboot_Request_Channel";
+constexpr char REBOOT_RESPONSE_NOTIFICATION_CHANNEL[] = "Reboot_Response_Channel";
+constexpr char REBOOT_KEY[] = "Reboot";
+constexpr char REBOOT_STATUS_KEY[] = "RebootStatus";
+constexpr char CANCEL_REBOOT_KEY[] = "CancelReboot";
+constexpr char DATA_TUPLE_KEY[] = "MESSAGE";
 
 class RebootBE {
  public:

diff --git a/src/sonic-framework/rebootbackend/redis_utils.cpp b/src/sonic-framework/rebootbackend/redis_utils.cpp
diff --git a/src/sonic-framework/rebootbackend/redis_utils.h b/src/sonic-framework/rebootbackend/redis_utils.h
diff --git a/src/sonic-framework/tests/Makefile.am b/src/sonic-framework/tests/Makefile.am
@@ -31,8 +31,6 @@ tests_SOURCES = test_utils_common.cpp \
                 $(top_srcdir)/rebootbackend/system/system.pb.cc \
                 $(top_srcdir)/rebootbackend/types/types.pb.cc \
                 $(top_srcdir)/rebootbackend/common/common.pb.cc \
-                redis_utils_test.cpp \
-                $(top_srcdir)/rebootbackend/redis_utils.cpp \
                 test_main.cpp
 
 tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_COVERAGE) $(CFLAGS_SAI)

diff --git a/src/sonic-framework/tests/reboot_thread_test.cpp b/src/sonic-framework/tests/reboot_thread_test.cpp
@@ -12,7 +12,6 @@
 #include "mock_reboot_interfaces.h"
 #include "reboot_common.h"
 #include "reboot_interfaces.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "status_code_util.h"
@@ -97,7 +96,6 @@ class RebootThreadTest : public ::testing::Test {
         m_config_db("CONFIG_DB", 0),
         m_reboot_thread(m_dbus_interface, 
                         m_finished) {
-    swss::WarmStart::initialize("app1", "docker1");
     sigterm_requested = false;
   }
 

diff --git a/src/sonic-framework/tests/rebootbe_test.cpp b/src/sonic-framework/tests/rebootbe_test.cpp
@@ -27,6 +27,7 @@ namespace rebootbackend {
 #define ONE_SECOND_MS (1000)
 #define FIFTEEN_HUNDRED_MS (1500)
 #define TWO_SECONDS_MS (2000)
+#define SELECT_TIMEOUT_250_MS (250)
 
 namespace gpu = ::google::protobuf::util;
 using namespace gnoi::system;
@@ -75,20 +76,6 @@ class RebootBETestWithoutStop : public ::testing::Test {
   }
   virtual ~RebootBETestWithoutStop() = default;
 
-  gnoi::system::RebootStatusResponse default_not_started_status() {
-    InitThreadStatus status;
-    return status.get_response();
-  }
-
-  gnoi::system::RebootStatusResponse default_done_status() {
-    InitThreadStatus status;
-    // We can't edit the status without it being active.
-    status.set_start_status();
-    status.set_success();
-    status.set_inactive();
-    return status.get_response();
-  }
-
 
   void start_rebootbe() {
     m_rebootbe_thread =
@@ -102,11 +89,11 @@ class RebootBETestWithoutStop : public ::testing::Test {
   }
 
   void overwrite_reboot_timeout(uint32_t timeout_seconds) {
-    m_rebootbe.m_reboot_thread.m_reboot_timeout = timeout_seconds;
+    m_rebootbe.m_RebootThread.m_reboot_timeout = timeout_seconds;
   }
 
 
-  void send_stop_reboot_thread() { m_rebootbe.m_reboot_thread.Stop(); }
+  void send_stop_reboot_thread() { m_rebootbe.m_RebootThread.Stop(); }
 
   void SendRebootRequest(const std::string &op, const std::string &data,
                          const std::string &field, const std::string &value) {
@@ -188,7 +175,7 @@ class RebootBETestWithoutStop : public ::testing::Test {
   }
 
   NotificationResponse handle_reboot_request(std::string &json_request) {
-    return m_rebootbe.handle_reboot_request(json_request);
+    return m_rebootbe.HandleRebootRequest(json_request);
   }
 
 

diff --git a/src/sonic-framework/tests/redis_utils_test.cpp b/src/sonic-framework/tests/redis_utils_test.cpp
diff --git a/src/sonic-framework/tests/test_utils_common.cpp b/src/sonic-framework/tests/test_utils_common.cpp
@@ -8,7 +8,6 @@
 
 #include "dbconnector.h"
 #include "notificationconsumer.h"
-#include "redis_utils.h"
 #include "select.h"
 #include "selectableevent.h"
 #include "table.h"