Merge pull request #4 from rdkcentral/sprint/24Q3

sync to sprint
santoshcomcast · Sep 11, 2024 · 778fc63 · 778fc63
2 parents 1a1b1f9 + 9e66835
commit 778fc63
Show file tree

Hide file tree

Showing 37 changed files with 1,316 additions and 768 deletions.
diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml
@@ -255,6 +255,7 @@ jobs:
           -DHAS_API_SYSTEM
           -DHAS_API_POWERSTATE
           -DHAS_RBUS
+          -DDISABLE_SECURITY_TOKEN
           -DENABLE_DEVICE_MANUFACTURER_INFO"
           -DCOMCAST_CONFIG=OFF
           -DCMAKE_DISABLE_FIND_PACKAGE_DS=ON

diff --git a/.github/workflows/L2-CloudStore.yml b/.github/workflows/L2-CloudStore.yml
@@ -37,4 +37,4 @@ jobs:
 # Usage:
 # PATH=${PWD}/install/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try Thunder -f -c ${PWD}/install/etc/Thunder/config.json
 # (to stop press q & enter)
-# curl -d '{"jsonrpc":"2.0","id":0,"method":"org.rdk.CloudStore.setValue","params":{"namespace":"test","key":"key1","value":"1","ttl":100}}' http://localhost:55555/jsonrpc
+# curl -d '{"jsonrpc":"2.0","id":0,"method":"org.rdk.CloudStore.setValue","params":{"scope":"account","namespace":"test","key":"key1","value":"1","ttl":100}}' http://localhost:55555/jsonrpc
diff --git a/.github/workflows/L2-tests-R4-4-1.yml b/.github/workflows/L2-tests-R4-4-1.yml
@@ -60,20 +60,31 @@ jobs:
             ninja -C build
             sudo ninja -C build install
 
+      - name: Checkout rdkservices
+        uses: actions/checkout@v3
+        with:
+          path: rdkservices
+
       - name: Checkout Thunder
         uses: actions/checkout@v3
         with:
           repository: rdkcentral/Thunder
           path: Thunder
           ref: ${{env.THUNDER_REF}}
 
+      - name: Apply patches Thunder
+        run: |
+          cd ${{github.workspace}}/Thunder
+          patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
+          cd -
+
       - name: Checkout ThunderTools
         if: steps.cache.outputs.cache-hit != 'true'
         uses: actions/checkout@v3
         with:
           repository: rdkcentral/ThunderTools
           path: ThunderTools
-          ref: ${{env.THUNDER_REF}}
+          ref: R4.4.3
 
       - name: Build ThunderTools
         if: steps.cache.outputs.cache-hit != 'true'
@@ -90,11 +101,6 @@ jobs:
           &&
           cmake --install build/ThunderTools
 
-      - name: Checkout rdkservices
-        uses: actions/checkout@v3
-        with:
-          path: rdkservices
-
       - name: Checkout rdkservices
         run: |
           cd ${{github.workspace}}/rdkservices
@@ -138,6 +144,7 @@ jobs:
               patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/0007-RDK-IDeviceInfo-Changes.patch
               patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/0001-RDK-45037-Secure-Storage-Thunder-Plugin.patch
               patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/RDKV-48604-User-Settings-Thunder-Plugin.patch
+              patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/Use_Legact_Alt_In_ThunderInterfaces_Based_On_ThunderTools_R4.4.3.patch
               cd ..
 
       - name: Build ThunderInterfaces
@@ -247,6 +254,7 @@ jobs:
           -include ${{github.workspace}}/rdkservices/Tests/mocks/pkg.h
           -Werror -Wall -Wunused-variable -Wno-deprecated-declarations -Wno-error=format=
           -DUSE_IARMBUS
+          -DDISABLE_SECURITY_TOKEN
           -DENABLE_THERMAL_PROTECTION"
           -DPLUGIN_PERSISTENTSTORE_PATH="/tmp/secure/persistent/rdkservicestore"
           -DPLUGIN_PERSISTENTSTORE_LEGACYPATH="/tmp/persistent/rdkservicestore"

diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml
@@ -220,6 +220,7 @@ jobs:
           -include ${{github.workspace}}/rdkservices/Tests/mocks/pkg.h
           -Wall -Werror -Wno-error=format=
           -DUSE_IARMBUS
+          -DDISABLE_SECURITY_TOKEN
           -DENABLE_THERMAL_PROTECTION"
           -DCOMCAST_CONFIG=OFF
           -DCMAKE_DISABLE_FIND_PACKAGE_DS=ON

diff --git a/Bluetooth/Bluetooth.cpp b/Bluetooth/Bluetooth.cpp
@@ -788,15 +788,15 @@ namespace WPEFramework
 
             lstBtrMgrEvtRsp.m_deviceHandle = deviceID;
 
-            if (eventType.compare(EVT_PAIRING_REQUEST)) {
+            if (eventType == EVT_PAIRING_REQUEST) {
                 lstBtrMgrEvtRsp.m_eventType = BTRMGR_EVENT_RECEIVED_EXTERNAL_PAIR_REQUEST;
                 lstBtrMgrEvtRsp.m_eventResp = Utils::String::equal(respValue, "ACCEPTED") ? 1 : 0;
             }
-            else if (eventType.compare(EVT_CONNECTION_REQUEST)) {
+            else if (eventType == EVT_CONNECTION_REQUEST) {
                 lstBtrMgrEvtRsp.m_eventType = BTRMGR_EVENT_RECEIVED_EXTERNAL_CONNECT_REQUEST;
                 lstBtrMgrEvtRsp.m_eventResp = Utils::String::equal(respValue, "ACCEPTED") ? 1 : 0;
             }
-            else if (eventType.compare(EVT_PLAYBACK_REQUEST)) {
+            else if (eventType == EVT_PLAYBACK_REQUEST) {
                 lstBtrMgrEvtRsp.m_eventType = BTRMGR_EVENT_RECEIVED_EXTERNAL_PLAYBACK_REQUEST;
                 lstBtrMgrEvtRsp.m_eventResp = Utils::String::equal(respValue, "ACCEPTED") ? 1 : 0;
             }

diff --git a/CloudStore/Module.h b/CloudStore/Module.h
@@ -32,6 +32,14 @@
 #define URI_ENV "CLOUDSTORE_URI"
 #define IARM_INIT_NAME "Thunder_Plugins"
 #define URI_RFC "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.CloudStore.Uri"
+#define PARTNER_ID_FILENAME "/opt/www/authService/partnerId3.dat"
+#define ACCOUNT_ID_FILENAME "/opt/www/authService/said.dat"
+#define DEVICE_ID_FILENAME "/opt/www/authService/xdeviceid.dat"
+#define SECURITY_AGENT_FILENAME "/tmp/SecurityAgent/token"
+#define IARM_TIMEOUT 1000
+#define COM_RPC_TIMEOUT 1000
+#define JSON_RPC_TIMEOUT 2000
+#define GRPC_TIMEOUT 3000
 
 #undef EXTERNAL
 #define EXTERNAL