Feature/l2mm test setup

.github/workflows/L2-tests.yml

@@ -107,6 +107,14 @@ jobs:
         with:
           repository: rdkcentral/entservices-testframework
           path: entservices-testframework
+          ref: feature/L2mm_test_setup_refined
+          token: ${{ secrets.RDKCM_RDKE }}
+
+      - name: Checkout networkmanager
+        uses: actions/checkout@v3
+        with:
+          repository: rdkcentral/networkmanager
+          path: networkmanager
           ref: develop
           token: ${{ secrets.RDKCM_RDKE }}
 
@@ -128,6 +136,13 @@ 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: Apply patches Network manager
+        run: |  
+            cd $GITHUB_WORKSPACE/networkmanager
+            patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Networkmanager.patch
             cd -
 
       - name: Build ThunderTools
@@ -312,6 +327,38 @@ jobs:
           &&
           cmake --install build/mocks
 
+
+      - 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 networkmanager 
+        run: |
+          # Configure networkmanager
+          cmake \
+          -S "$GITHUB_WORKSPACE/networkmanager" \
+          -B build/networkmanager_rdk \
+          -DCMAKE_TOOLCHAIN_FILE="${{ env.TOOLCHAIN_FILE }}" \
+          -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr" \
+          -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/install/usr" \
+          -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+          -DCMAKE_CXX_FLAGS="-I$GITHUB_WORKSPACE/networkmanager/tests/headers -I$GITHUB_WORKSPACE/networkmanager/tests/headers/rdk/iarmbus --include $GITHUB_WORKSPACE/networkmanager/tests/mocks/Iarm.h --include $GITHUB_WORKSPACE/networkmanager/tests/mocks/secure_wrappermock.h -Wall --coverage" \
+          -DENABLE_UNIT_TESTING=ON \
+          -DENABLE_ROUTER_DISCOVERY_TOOL=OFF
+
+          # Build
+          cmake --build build/networkmanager_rdk -j8
+
+          # Install
+          cmake --install build/networkmanager_rdk
+          cat /home/runner/work/entservices-softwareupdate/entservices-softwareupdate/install/usr/../etc/WPEFramework/plugins/LegacyNetworkAPIs.json
+
       - name: Build entservices-softwareupdate
         run: >
           cmake
@@ -373,6 +420,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
@@ -392,6 +440,7 @@ jobs:
           -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install/usr"
           -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake"
           -DHIDE_NON_EXTERNAL_SYMBOLS=OFF
+          -DL2_TEST_OOP_RPC=ON
           -DCMAKE_CXX_FLAGS="
           -DEXCEPTIONS_ENABLE=ON
           -fprofile-arcs
@@ -401,6 +450,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 +495,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
@@ -488,6 +539,7 @@ jobs:
           if [ ! -f mknod /dev/sdb2 c 240 0 ]; then mknod /dev/sdb2 c 240 0; fi
           &&
           sudo touch
+          /opt/persistent/timeZoneDST
           /opt/standbyReason.txt
           /opt/tmtryoptout
           /opt/fwdnldstatus.txt
@@ -604,6 +656,8 @@ jobs:
           -o coverage
           -t "entservices-softwareupdate coverage"
           filtered_coverage.info
+          &&
+          lcov --extract filtered_coverage.info "*/MaintenanceManager/MaintenanceManager.cpp" -o maintenancemanager_coverage.info
 
       - name: Upload artifacts
         if: ${{ !env.ACT }}

MaintenanceManager/CMakeLists.txt

@@ -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.cpp

@@ -1557,7 +1557,7 @@ namespace WPEFramework
             MaintenanceManager::g_lastSuccessful_maint_time = "";
             MaintenanceManager::g_task_status = 0;
             MaintenanceManager::m_abort_flag = false;
-            MaintenanceManager::g_unsolicited_complete = false;
+			MaintenanceManager::g_unsolicited_complete = false;
 
             /* we post just to tell that we are in idle at this moment */
             m_statusMutex.lock();

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