Feature/l2mm

.github/workflows/L2-tests.yml

@@ -107,7 +107,15 @@ jobs:
         with:
           repository: rdkcentral/entservices-testframework
           path: entservices-testframework
-          ref: develop
+          ref: feature/L2mm
+          token: ${{ secrets.RDKCM_RDKE }}
+
+      - name: Checkout networkmanager
+        uses: actions/checkout@v3
+        with:
+          repository: rdkcentral/networkmanager
+          path: networkmanager
+          ref: feature/L2mock
           token: ${{ secrets.RDKCM_RDKE }}
 
       - name: Checkout googletest
@@ -128,6 +136,7 @@ jobs:
         run: |  
             cd $GITHUB_WORKSPACE/entservices-softwareupdate
             patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Firmware_postFlash.patch
+            patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/maintenancemanager.patch
             cd -
 
       - name: Build ThunderTools
@@ -197,7 +206,7 @@ jobs:
           cmake --build build/entservices-apis -j8
           &&
           cmake --install build/entservices-apis
-
+          
       - name: Generate external headers
         # Empty headers to mute errors
         run: >
@@ -373,6 +382,7 @@ jobs:
           -DCMAKE_DISABLE_FIND_PACKAGE_RFC=ON
           -DCMAKE_DISABLE_FIND_PACKAGE_RBus=ON
           -DPLUGIN_FIRMWAREUPDATE=ON
+          -DPLUGIN_MAINTENANCEMANAGER=ON
           -DUSE_THUNDER_R4=ON
           -DPLUGIN_L2Tests=ON
           -DRDK_SERVICE_L2_TEST=ON
@@ -382,6 +392,17 @@ jobs:
           cmake --build build/entservices-softwareupdate -j8
           &&
           cmake --install build/entservices-softwareupdate
+
+      - name: Generate IARM headers
+        run: |
+            touch install/usr/lib/libIARMBus.so 
+            mkdir -p install/usr/include/rdk/iarmbus
+            touch install/usr/include/rdk/iarmbus/libIARM.h
+            cd "${{github.workspace}}/networkmanager/tests/"
+            mkdir -p headers/rdk/iarmbus
+            cd headers
+            touch rdk/iarmbus/libIARM.h rdk/iarmbus/libIBus.h
+
 
       - name: Build entservices-testframework
         run: >
@@ -392,6 +413,8 @@ jobs:
           -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
           -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
           -DHIDE_NON_EXTERNAL_SYMBOLS=OFF
+          -DRDK_SERVICE_L2_TEST=ON
+          -DL2_TEST_OOP_RPC=ON
           -DCMAKE_CXX_FLAGS="
           -DEXCEPTIONS_ENABLE=ON
           -fprofile-arcs
@@ -401,6 +424,7 @@ jobs:
           -DTHUNDER_VERSION_MAJOR=4
           -DTHUNDER_VERSION_MINOR=4
           -DDEVICE_TYPE=AVOutputTV
+          -DMOCKACCESSOR_LIBRARIES=ON
           -DPLUGIN_PERSISTENTSTORE_PATH="/tmp/secure/persistent/rdkservicestore"
           -DPLUGIN_PERSISTENTSTORE_LEGACYPATH="/tmp/persistent/rdkservicestore"
           -I $GITHUB_WORKSPACE/entservices-testframework/Tests/headers
@@ -445,6 +469,7 @@ jobs:
           -DCMAKE_DISABLE_FIND_PACKAGE_RFC=ON
           -DCMAKE_DISABLE_FIND_PACKAGE_RBus=ON
           -DPLUGIN_FIRMWAREUPDATE=ON
+          -DPLUGIN_MAINTENANCEMANAGER=ON
           -DUSE_THUNDER_R4=ON
           -DPLUGIN_L2Tests=ON
           -DRDK_SERVICE_L2_TEST=ON
@@ -559,8 +584,7 @@ jobs:
           LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install/usr/lib:$GITHUB_WORKSPACE/install/usr/lib/wpeframework/plugins:${LD_LIBRARY_PATH}
           RdkServicesL2Test &&
           cp -rf $(pwd)/rdkL2TestResults.json $GITHUB_WORKSPACE/rdkL2TestResultsWithoutValgrind.json &&
-          rm -rf $(pwd)/rdkL2TestResults.json
-
+          rm -rf $(pwd)/rdkL2TestResults.json 
       - name: Run unit tests with valgrind
         if: ${{ !env.ACT }}
         run: >

MaintenanceManager/CMakeLists.txt

@@ -21,7 +21,7 @@ set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 set(PLUGIN_MAINTENANCEMGR_STARTUPORDER "" CACHE STRING "To configure startup order of MaintenanceManager plugin")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
-
+#add_executable(${MODULE_NAME}
 add_library(${MODULE_NAME} SHARED
         MaintenanceManager.cpp
         Module.cpp)
@@ -61,6 +61,17 @@ if (ENABLE_JOURNAL_LOGGING)
     target_link_libraries(${MODULE_NAME} PRIVATE systemd)
 endif()
 
+if (RDK_SERVICE_L2_TEST)
+   find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib)
+   if (TESTMOCKLIB_LIBRARIES)
+       message ("linking mock libraries ${TESTMOCKLIB_LIBRARIES} library")
+       target_link_libraries(${MODULE_NAME} PRIVATE ${TESTMOCKLIB_LIBRARIES})
+       target_link_options(${MODULE_NAME} PRIVATE -Wl,--wrap,open -Wl,--wrap,mkdir -Wl,--wrap,mount -Wl,--wrap,umount -Wl,--wrap,ioctl -Wl,--wrap,statvfs -Wl,--wrap,statfs -Wl,--wrap,stat  -Wl,--wrap,rmdir)
+   else (TESTMOCKLIB_LIBRARIES)
+       message ("Require ${TESTMOCKLIB_LIBRARIES} library")
+   endif (TESTMOCKLIB_LIBRARIES)
+endif (RDK_SERVICES_L2_TEST)
+
 # Add Task Timeout
 if (TASK_TIMEOUT)
     message(STATUS "Task Timeout set to ${TASK_TIMEOUT}")

MaintenanceManager/MaintenanceManager.h

@@ -326,6 +326,8 @@ namespace WPEFramework
             uint32_t startMaintenance(const JsonObject &parameters, JsonObject &response);
             uint32_t stopMaintenance(const JsonObject &parameters, JsonObject &response);
             uint32_t getMaintenanceMode(const JsonObject &parameters, JsonObject &response);
+            uint32_t isConnectedToInternet(const JsonObject& parameters, JsonObject& response);
+
         }; /* end of MaintenanceManager service class */
     } /* end of plugin */
 } /* end of wpeframework */

MaintenanceManager/Test/MockMaintenancemanager.h

@@ -0,0 +1,15 @@
+#pragma once
+#include "../MaintenanceManager.h"
+
+namespace WPEFramework {
+namespace Plugin {
+
+class MaintenanceManager : public PluginHost::IPlugin, public PluginHost::JSONRPC
+{
+public:
+    uint32_t MaintenanceManager::isConnectedToInternet(const JsonObject& parameters, JsonObject& response);
+
+};
+
+} // namespace Plugin
+} // namespace WPEFramework

MaintenanceManager/Test/Mockmaintenancemanager.cpp

@@ -0,0 +1,18 @@
+#pragma once
+#include "../MaintenanceManager.h"
+
+namespace WPEFramework {
+namespace Plugin {
+
+uint32_t MaintenanceManager::isConnectedToInternet(const JsonObject& parameters, JsonObject& response)
+        { 
+           uint32_t rc = Core::ERROR_NONE;
+		   MM_LOGINFO("Inside isConnectedTointernet");
+           //response["connectedToInternet"] = "true";
+		   response["connectedToInternet"] = true;
+           response["success"] = "true"; 
+           return rc;           
+        }
+
+} // namespace Plugin
+} // namespace WPEFramework

Tests/L2Tests/CMakeLists.txt

@@ -26,6 +26,10 @@ if(PLUGIN_FIRMWAREUPDATE)
     set(SRC_FILES ${SRC_FILES} tests/FirmwareUpdate_L2Test.cpp)
 endif()
 
+if(PLUGIN_MAINTENANCEMANAGER)
+set(SRC_FILES ${SRC_FILES} tests/MaintenancemanagerL2.cpp)
+endif()
+
 add_library(${MODULE_NAME} SHARED ${SRC_FILES})
 
 set_target_properties(${MODULE_NAME} PROPERTIES
@@ -65,6 +69,7 @@ target_include_directories(
     ../../../entservices-testframework/Tests/mocks/thunder
     ../../../entservices-testframework/Tests/mocks/devicesettings
     ../../../entservices-testframework/Tests/mocks/MockPlugin
+    ../../../entservices-testframework/Tests/mocks/MockNetwork
     ../../../entservices-testframework/Tests/L2Tests/L2TestsPlugin
     ${CMAKE_INSTALL_PREFIX}/include
     )

Tests/L2Tests/tests/MaintenancemanagerL2.cpp

@@ -0,0 +1,180 @@
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include "L2Tests.h"
+#include "L2TestsMock.h"
+#include <fstream>
+#include <iostream>
+#include <condition_variable>
+#include "MockNetworkPlugin.h"
+//#include "MockNetworkPlugin.cpp"
+
+//gv
+using ::testing::_;
+using ::testing::Invoke;
+using ::testing::Test;
+using ::testing::StrEq;
+using namespace WPEFramework;
+
+/*
+#define TEST_LOG(x, ...) fprintf( stderr, "\033[1;32m[%s:%d](%s)<PID:%d><TID:%d>" x "\n\033[0m", __FILE__, __LINE__, __FUNCTION__, getpid(), gettid(), ##__VA_ARGS__); fflush(stderr);
+
+#define JSON_TIMEOUT   (1000)
+*/
+#define MAINTENANCEMANAGER_CALLSIGN  _T("org.rdk.MaintenanceManager")
+#define MAINTENANCEMANAGERL2TEST_CALLSIGN _T("L2tests.1")
+
+
+
+class MaintenanceManagerTest : public L2TestMocks {
+protected:
+    virtual ~MaintenanceManagerTest() override;
+
+public:
+    MaintenanceManagerTest();
+};
+
+MaintenanceManagerTest::MaintenanceManagerTest() : L2TestMocks() {
+    IARM_EventHandler_t               controlEventHandler_;
+    uint32_t status = Core::ERROR_GENERAL;
+    status = ActivateService("org.rdk.MaintenanceManager");
+    EXPECT_EQ(Core::ERROR_NONE, status);
+    status =ActivateService("org.rdk.Network");
+    EXPECT_EQ(Core::ERROR_NONE, status);
+    /*
+    EXPECT_CALL(*p_iarmBusImplMock, IARM_Bus_RegisterEventHandler(StrEq(IARM_BUS_MAINTENANCE_MGR_NAME),IARM_BUS_MAINTENANCEMGR_EVENT_UPDATE, _))
+            .WillOnce(Invoke(
+                [&](const char* ownerName, IARM_EventId_t eventId, IARM_EventHandler_t handler) {
+                    controlEventHandler_ = handler;
+                    return IARM_RESULT_SUCCESS;
+                })); */
+
+
+/*        EXPECT_CALL(*p_iarmBusImplMock, IARM_Bus_RegisterEventHandler(StrEq(IARM_BUS_MAINTENANCE_MGR_NAME), IARM_BUS_DCM_NEW_START_TIME_EVENT, _))
+            .WillRepeatedly(Invoke(
+                [&](const char* ownerName, IARM_EventId_t eventId, IARM_EventHandler_t handler) {
+                    EXPECT_TRUE(isValidCtrlmRcuIarmEvent(eventId));
+                    controlEventHandler_ = handler;
+                    return IARM_RESULT_SUCCESS;
+                }));  */
+
+   // PluginHost::IShell::state state = PluginHost::IShell::state::ACTIVATED; //ghg
+    //ActivateService("org.rdk.Network");
+    //status = ActivateService("org.rdk.MockPlugin");
+   // EXPECT_EQ(Core::ERROR_NONE, status);
+
+
+/*    
+    status = ActivateService("org.rdk.Network");
+    EXPECT_EQ(Core::ERROR_NONE, status);
+
+*/
+   /* status = ActivateService("org.rdk.Network");
+    EXPECT_EQ(Core::ERROR_NONE, status);
+    status = Core::ERROR_GENERAL;
+    status = ActivateService("org.rdk.AuthService");
+    EXPECT_EQ(Core::ERROR_NONE, status);
+    status = Core::ERROR_GENERAL; */
+
+    /*
+    status = Core::ERROR_GENERAL;
+    status = ActivateService("org.rdk.Network.1");
+    status = ActivateService("org.rdk.MaintenanceManager");
+    EXPECT_EQ(Core::ERROR_NONE, status);
+    JsonObject params, params1;
+    JsonObject results, results1;
+    params1["ipversion"] ="IPv4"; */
+
+    //status = InvokeServiceMethod("org.rdk.MaintenanceManager", "isConnectedToInternet", params1, results1);
+    //status = InvokeServiceMethod("org.rdk.Network", "isConnectedToInternet", params1, results1);
+}
+
+MaintenanceManagerTest::~MaintenanceManagerTest() {
+    uint32_t status = Core::ERROR_GENERAL;
+    status = DeactivateService("org.rdk.MaintenanceManager");
+   // EXPECT_EQ(Core::ERROR_NONE, status); //hbhj
+}
+
+//worked
+// commented background
+
+TEST_F(MaintenanceManagerTest, TestStartMaintenance)
+{
+    JsonObject params, params1;
+    JsonObject results, results1;
+    params["maintenanceMode"] = "BACKGROUND";
+    params["optOut"] = "IGNORE_UPDATE";
+
+    //InvokeServiceMethod("org.rdk.MaintenanceManager", "isConnectedToInternet", params1, results1);
+
+    EXPECT_CALL(*p_iarmBusImplMock, IARM_Bus_BroadcastEvent)
+            .Times(::testing::AnyNumber())
+            .WillRepeatedly(
+                    [](const char* ownerName, int eventId, void* arg, size_t argLen) {
+                    return IARM_RESULT_SUCCESS;
+                    });
+    sleep(30);
+    uint32_t status = InvokeServiceMethod("org.rdk.MaintenanceManager", "setMaintenanceMode", params, results);
+
+    params1["ipversion"] ="IPv4";
+    //InvokeServiceMethod("org.rdk.MaintenanceManager", "isConnectedToInternet", params1, results1);
+    //InvokeServiceMethod("org.rdk.Network.1", "isConnectedToInternet", params1, results1);
+    ASSERT_EQ(status, Core::ERROR_NONE);
+    ASSERT_EQ(results["success"].Boolean(), true);
+    DeactivateService("org.rdk.MaintenanceManager");
+
+
+    //status = DeactivateService("org.rdk.MaintenanceManager"); //jjj
+  //  EXPECT_EQ(Core::ERROR_NONE, status);
+}
+
+
+
+TEST_F(MaintenanceManagerTest, TestStartMaintenance1)
+{
+    JsonObject params;
+    JsonObject results;
+    params["reason"] = "scheduled";
+    sleep(10);
+    uint32_t status = InvokeServiceMethod("org.rdk.MaintenanceManager", "startMaintenance", params, results);
+
+    ASSERT_EQ(status, Core::ERROR_NONE);
+    ASSERT_EQ(results["success"].Boolean(), true);
+}
+
+
+
+
+/* 
+TEST_F(L2TestMocks, TestStartMaintenance)
+{
+    JsonObject params;
+    JsonObject results;
+    params["reason"] = "scheduled";
+    uint32_t status = InvokeServiceMethod("MaintenanceManager.1", "startMaintenance", params, results);
+
+    ASSERT_EQ(status, Core::ERROR_NONE);
+    ASSERT_EQ(results["success"].Boolean(), true);
+}
+*/
+
+/*
+TEST_F(MaintenanceManagerTest, EmptyPartnerId) {
+    JsonObject params, result;
+    params["partnerId"] = "";
+    uint32_t status = InvokeServiceMethod("org.rdk.MaintenanceManager", "isConnectedToInternet", params, result);
+    EXPECT_NE(status, Core::ERROR_NONE); // Should fail or return error for empty partnerId
+}
+*/
+
+//
+/*
+TEST_F(MaintenanceManagerTest, ValidDeviceInitializationContext) {
+
+    JsonObject contextData, fullResponse, result;
+    contextData["partnerId"] = "Sky";
+    contextData["regionalConfigService"] = "region.sky.com";
+    fullResponse["deviceInitializationContext"] = contextData;
+    uint32_t status = InvokeServiceMethod("org.rdk.MaintenanceManager", "setDeviceInitializationContext", fullResponse, result);
+    EXPECT_EQ(status, Core::ERROR_NONE); //hbbhkm
+*/
+