Feature/mockbuild

.github/workflows/L2-tests.yml

@@ -87,6 +87,7 @@ jobs:
           repository: rdkcentral/ThunderTools
           path: ThunderTools
           ref: R4.4.3
+
 
       - name: Checkout entservices-softwareupdate
         if: ${{ inputs.caller_source == 'local' }}
@@ -100,7 +101,7 @@ jobs:
         with:
           repository: rdkcentral/entservices-softwareupdate
           path: entservices-softwareupdate
-          ref: develop
+          ref: feature/nwbuild
 
       - name: Checkout entservices-testframework
         uses: actions/checkout@v3
@@ -311,7 +312,7 @@ jobs:
           cmake --build build/mocks -j8
           &&
           cmake --install build/mocks
-
+          
       - name: Build entservices-softwareupdate
         run: >
           cmake
@@ -382,6 +383,12 @@ jobs:
           cmake --build build/entservices-softwareupdate -j8
           &&
           cmake --install build/entservices-softwareupdate
+          &&
+          cat /home/runner/work/entservices-softwareupdate/entservices-softwareupdate/install/usr/../etc/WPEFramework/plugins/LegacyWiFiManagerAPIs.json
+          &&
+          cp /home/runner/work/entservices-softwareupdate/entservices-softwareupdate/install/usr/../etc/WPEFramework/plugins/LegacyWiFiManagerAPIs.json /home/runner/work/entservices-softwareupdate/entservices-softwareupdate/install/usr/../etc/WPEFramework/plugins/Network.json
+          &&
+          cat /home/runner/work/entservices-softwareupdate/entservices-softwareupdate/install/usr/../etc/WPEFramework/plugins/Network.json
 
       - name: Build entservices-testframework
         run: >

CMakeLists.txt

@@ -39,6 +39,7 @@ include(CmakeHelperFunctions)
 
 if(RDK_SERVICE_L2_TEST)
     add_subdirectory(Tests/L2Tests)
+    add_subdirectory(Tests/L2Tests/tests/MockNetwork)
 endif()
 
 option(DISABLE_SECURITY_TOKEN "Disable security token" OFF)

Network.json

@@ -0,0 +1,10 @@
+{
+  "locator": "libWPEFrameworkNetwork.so",
+  "classname": "Network",
+  "precondition": [
+    "Platform"
+  ],
+  "callsign": "org.rdk.Network",
+  "autostart": true,
+  "startuporder": 35
+}

Network.sh

@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Directory setup
+WORKSPACE="$(pwd)"   # or set explicitly to the repo root
+INSTALL_DIR="$WORKSPACE/install"
+BUILD_DIR="$WORKSPACE/build"
+
+echo "=== Update & install required packages ==="
+sudo apt update
+sudo apt-get install -y \
+  pkg-config libglib2.0-dev libnm-dev libcurl4-openssl-dev \
+  lcov ninja-build libgupnp-1.2-1 libgupnp-1.2-dev \
+  libgssdp-1.2-0 libsoup2.4-1 python3-pip
+
+echo "=== Install Python module jsonref ==="
+pip install --upgrade pip
+pip install jsonref
+
+echo "=== Install CMake 3.16.x if needed ==="
+# If your distro CMake is already >=3.16 you can skip this
+# Example using pip:
+pip install "cmake>=3.16,<3.17"
+
+echo "=== Clone Thunder repositories ==="
+mkdir -p "$WORKSPACE"
+cd "$WORKSPACE"
+
+# Only clone if the directories don’t exist (imitates cache behavior)
+if [ ! -d Thunder ]; then
+  git clone --branch "$THUNDER_REF" https://github.com/rdkcentral/Thunder
+fi
+if [ ! -d ThunderTools ]; then
+  git clone --branch "$THUNDER_REF" https://github.com/rdkcentral/ThunderTools
+fi
+if [ ! -d ThunderInterfaces ]; then
+  git clone --branch "$THUNDER_REF" https://github.com/rdkcentral/ThunderInterfaces
+fi
+
+# Checkout networkmanager (assuming this repo already contains it)
+if [ ! -d networkmanager ]; then
+  git clone "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" networkmanager
+fi
+
+echo "=== Apply Thunder patch ==="
+cd "$WORKSPACE/Thunder"
+git apply "$WORKSPACE/networkmanager/tests/patches/thunder/SubscribeStub.patch" || true
+
+echo "=== Build ThunderTools ==="
+cmake -S "$WORKSPACE/ThunderTools" -B "$BUILD_DIR/ThunderTools" \
+  -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR/usr" \
+  -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
+  -DGENERIC_CMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake"
+cmake --build "$BUILD_DIR/ThunderTools" --target install -j"$(nproc)"
+
+echo "=== Build Thunder ==="
+cmake -S "$WORKSPACE/Thunder" -B "$BUILD_DIR/Thunder" \
+  -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR/usr" \
+  -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
+  -DBUILD_TYPE=Debug \
+  -DBINDING=127.0.0.1 \
+  -DPORT=9998
+cmake --build "$BUILD_DIR/Thunder" --target install -j"$(nproc)"
+
+echo "=== Build ThunderInterfaces ==="
+cmake -S "$WORKSPACE/ThunderInterfaces" -B "$BUILD_DIR/ThunderInterfaces" \
+  -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR/usr" \
+  -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake"
+cmake --build "$BUILD_DIR/ThunderInterfaces" --target install -j"$(nproc)"
+
+echo "=== Generate IARM headers ==="
+mkdir -p "$INSTALL_DIR/usr/lib"
+touch "$INSTALL_DIR/usr/lib/libIARMBus.so"
+
+mkdir -p "$INSTALL_DIR/usr/include/rdk/iarmbus"
+touch "$INSTALL_DIR/usr/include/rdk/iarmbus/libIARM.h"
+
+mkdir -p "$WORKSPACE/networkmanager/tests/headers/rdk/iarmbus"
+touch "$WORKSPACE/networkmanager/tests/headers/rdk/iarmbus/libIARM.h"
+touch "$WORKSPACE/networkmanager/tests/headers/rdk/iarmbus/libIBus.h"
+
+echo "=== Build networkmanager with RDK Proxy ==="
+cmake -S "$WORKSPACE/networkmanager" -B "$BUILD_DIR/networkmanager_rdk" \
+  -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN_FILE" \
+  -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR/usr" \
+  -DCMAKE_MODULE_PATH="$INSTALL_DIR/tools/cmake" \
+  -DCMAKE_CXX_FLAGS="\
+    -I $WORKSPACE/networkmanager/tests/headers \
+    -I $WORKSPACE/networkmanager/tests/headers/rdk/iarmbus \
+    --include $WORKSPACE/networkmanager/tests/mocks/Iarm.h \
+    --include $WORKSPACE/networkmanager/tests/mocks/secure_wrappermock.h \
+    -Wall --coverage" \
+  -DENABLE_UNIT_TESTING=ON \
+  -DENABLE_ROUTER_DISCOVERY_TOOL=OFF
+cmake --build "$BUILD_DIR/networkmanager_rdk" --target install -j"$(nproc)"
+
+echo "=== Run unit tests for Legacy_Network ==="
+export PATH="$INSTALL_DIR/usr/bin:$PATH"
+export LD_LIBRARY_PATH="$INSTALL_DIR/usr/lib:$INSTALL_DIR/usr/lib/wpeframework/plugins:${LD_LIBRARY_PATH:-}"
+cd "$WORKSPACE"
+legacynetwork_tests

Tests/L2Tests/tests/FirmwareUpdate_L2Test.cpp

@@ -8,6 +8,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
+*
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
@@ -16,7 +17,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include "L2Tests.h"
@@ -66,6 +66,24 @@ FirmwareUpdateTest:: FirmwareUpdateTest():L2TestMocks()
          /* Activate plugin in constructor */
          status = ActivateService("org.rdk.FirmwareUpdate");
          EXPECT_EQ(Core::ERROR_NONE, status);
+         status = Core::ERROR_GENERAL;
+         status = ActivateService("org.rdk.NetworkManager.1");
+         EXPECT_EQ(Core::ERROR_NONE, status);
+         status = Core::ERROR_GENERAL;
+         status = ActivateService("org.rdk.Network");
+         EXPECT_EQ(Core::ERROR_NONE, status);
+         status = ActivateService("org.rdk.Network.1");
+         EXPECT_EQ(Core::ERROR_NONE, status);
+         status = ActivateService("org.rdk.Network.2");
+         EXPECT_EQ(Core::ERROR_NONE, status);
+
+
+    JsonObject params, params1;
+    JsonObject results, results1;
+    params1["ipversion"] ="IPv4"; 
+    status = InvokeServiceMethod("org.rdk.Network.1", "isConnectedToInternet", params1, results1);
+    InvokeServiceMethod("org.rdk.Network", "isConnectedToInternet", params1, results1);
+    InvokeServiceMethod("org.rdk.Network.2", "isConnectedToInternet", params1, results1);
 }
 
 /**

Tests/L2Tests/tests/MockNetwork/CMakeLists.txt

@@ -0,0 +1,77 @@
+# If not stated otherwise in this file or this component's LICENSE file the
+# following copyright and licenses apply:
+#
+# Copyright 2025 RDK Management
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(PLUGIN_NAME Network)
+#set(MODULE_NAME ${PLUGIN_NAME})
+set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
+
+set(PLUGIN_NETWORK_AUTOSTART "false" CACHE STRING "Automatically start Network plugin")
+set(PLUGIN_LEGACY_NW_STARTUPORDER "35" CACHE STRING "To configure startup order of Legacy Network plugin")
+
+# Find required packages
+find_package(${NAMESPACE}Plugins REQUIRED)
+find_package(${NAMESPACE}Definitions REQUIRED)
+
+# Build the main plugin that runs inside the WPEFramework daemon
+#add_executable(${MODULE_NAME}
+add_library(${MODULE_NAME} SHARED
+    MockNetworkPlugin.cpp
+    Module.cpp
+)
+
+# Include directories
+target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../../../helpers ../../Tests/mocks /home/runner/work/entservices-softwareupdate/entservices-softwareupdate/entservices-testframework/Tests/mocks)
+
+# Link libraries
+target_link_libraries(${MODULE_NAME}
+    PRIVATE
+    ${NAMESPACE}Plugins::${NAMESPACE}Plugins
+    ${NAMESPACE}Definitions::${NAMESPACE}Definitions
+)
+
+find_library(MOCKACCESSOR_LIBRARIES NAMES MockAccessor)
+if (MOCKACCESSOR_LIBRARIES)
+    message ("Found MockAccessor library - ${MOCKACCESSOR_LIBRARIES}")
+    target_link_libraries(${MODULE_NAME} PRIVATE ${MOCKACCESSOR_LIBRARIES})
+else (MOCKACCESSOR_LIBRARIES)
+     message ("Require ${MOCKACCESSOR_LIBRARIES} library")
+endif (MOCKACCESSOR_LIBRARIES)
+
+find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib)
+message ("linking mock libraries ${TESTMOCKLIB_LIBRARIES} library")
+target_link_libraries(${MODULE_NAME} PRIVATE ${TESTMOCKLIB_LIBRARIES})
+target_link_options(${MODULE_NAME} PRIVATE -Wl,--wrap,mount -Wl,--wrap,umount -Wl,--wrap,ioctl -Wl,--wrap,statvfs -Wl,--wrap,statfs -Wl,--wrap,stat  -Wl,--wrap,rmdir)
+
+install(TARGETS
+    ${MODULE_NAME}
+    DESTINATION
+    lib/${STORAGE_DIRECTORY}/plugins
+)
+install(
+    FILES LegacyWiFiManagerAPIs.json
+    DESTINATION 
+    /home/runner/work/entservices-softwareupdate/entservices-softwareupdate/install/usr/../etc/WPEFramework/plugins
+)
+set_target_properties(${MODULE_NAME} PROPERTIES
+    CXX_STANDARD 11
+    CXX_STANDARD_REQUIRED YES
+)
+
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
+# Write configuration
+write_config(${PLUGIN_NAME})

Tests/L2Tests/tests/MockNetwork/LegacyWiFiManagerAPIs.json

@@ -0,0 +1,10 @@
+{
+  "locator": "libWPEFrameworkNetwork.so",
+  "classname": "Network",
+  "precondition": [
+    "Platform"
+  ],
+  "callsign": "org.rdk.Network",
+  "autostart": true,
+  "startuporder": 35
+}

Tests/L2Tests/tests/MockNetwork/MockNetworkPlugin.conf.in

@@ -0,0 +1,4 @@
+precondition = ["Platform"]
+callsign = "org.rdk.Network"
+autostart = "true"
+startuporder = "@PLUGIN_LEGACY_NW_STARTUPORDER@"

Tests/L2Tests/tests/MockNetwork/MockNetworkPlugin.config

@@ -0,0 +1,4 @@
+set (autostart true)
+set (preconditions Platform)
+set (callsign "org.rdk.Network")
+set (startuporder ${PLUGIN_LEGACY_NW_STARTUPORDER})