Merge pull request #5438 from Dosakaya/sprint/24Q2

RDK-49561: RDKV - System Services Plugin unit Test compliance with Thunder 4.4.1

.github/workflows/L2-tests.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   l2-tests:
-    name: Build and run L2 tests
+    name: Run L2 with Thunder R2
     runs-on: ubuntu-latest
     strategy:
       matrix:

Tests/L2Tests/CMakeLists.txt

@@ -45,11 +45,18 @@ set_source_files_properties(
 target_link_libraries(${PROJECT_NAME}
         gmock_main
         ${CMAKE_INSTALL_PREFIX}/lib/libWPEFrameworkCore.so
-        ${CMAKE_INSTALL_PREFIX}/lib/libWPEFrameworkProtocols.so
-        ${CMAKE_INSTALL_PREFIX}/lib/libWPEFrameworkTracing.so
         ${CMAKE_INSTALL_PREFIX}/lib/libTestMocklib.so
         )
 
+# Thudner R4 will not generate libWPEFrameworkProtocols.so, libWPEFrameworkTracing.so.
+# Thudner R2 will not generate libWPEFrameworkWebSocket.so.
+if (USE_THUNDER_R4)
+target_link_libraries(${PROJECT_NAME} ${CMAKE_INSTALL_PREFIX}/lib/libWPEFrameworkWebSocket.so)
+else ()
+target_link_libraries(${PROJECT_NAME} ${CMAKE_INSTALL_PREFIX}/lib/libWPEFrameworkProtocols.so)
+target_link_libraries(${PROJECT_NAME} ${CMAKE_INSTALL_PREFIX}/lib/libWPEFrameworkTracing.so)
+endif (USE_THUNDER_R4)
+
 target_compile_definitions(${PROJECT_NAME}
                              PRIVATE
                              CMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"

Tests/L2Tests/L2TestsPlugin/CMakeLists.txt

@@ -21,6 +21,9 @@ set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 set(THUNDER_PORT 9998)
 find_package(${NAMESPACE}Plugins REQUIRED)
 
+# We are not running VerifyContracts,Warehouse_L2Test tests for Thunder R4 as
+# this work is not in this scope. In future we will enable these tests for Thunder R4.
+if(NOT USE_THUNDER_R4)
 add_library(${MODULE_NAME} SHARED
     Module.cpp
     L2Tests.cpp
@@ -30,6 +33,15 @@ add_library(${MODULE_NAME} SHARED
     tests/Telemetry_L2Test.cpp
     tests/Warehouse_L2Test.cpp
     tests/VerifyContracts.cpp)
+else()
+add_library(${MODULE_NAME} SHARED
+    Module.cpp
+    L2Tests.cpp
+    L2TestsMock.cpp
+    tests/SystemService_L2Test.cpp
+    tests/UsbAccess_L2Test.cpp
+    tests/Telemetry_L2Test.cpp)
+endif(NOT USE_THUNDER_R4)
 
 set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11

files/0001-Add-TextToSpeech-Interface.patch

@@ -0,0 +1,29 @@
+Index: git/interfaces/ITextToSpeech.h
+===================================================================
+--- git.orig/interfaces/ITextToSpeech.h
++++ git/interfaces/ITextToSpeech.h
+@@ -65,6 +65,7 @@ namespace Exchange {
+
+         virtual void Register(ITextToSpeech::INotification* sink) = 0;
+         virtual void Unregister(ITextToSpeech::INotification* sink) = 0;
++        virtual void RegisterWithCallsign(const string callsign,ITextToSpeech::INotification* sink) = 0;
+
+         // @property
+         // @brief Query the status/enable tts
+@@ -80,6 +81,7 @@ namespace Exchange {
+         virtual uint32_t SetFallbackText(const string scenario,const string value) = 0;
+         virtual uint32_t SetAPIKey(const string apikey) = 0;
+         virtual uint32_t SetPrimaryVolDuck(const uint8_t prim) = 0;
++        virtual uint32_t SetACL(const string method,const string apps) = 0;
+
+         // @brief Retrieve tts configuration attributes 
+         // @param config tts configuration
+@@ -94,7 +96,7 @@ namespace Exchange {
+         // @param text for conversion
+         // @param speechid returns id for the text 
+         // @param status return status
+-        virtual uint32_t Speak(const string text,uint32_t &speechid/* @out */,TTSErrorDetail &status/* @out */) = 0;
++        virtual uint32_t Speak(const string callsign,const string text,uint32_t &speechid/* @out */,TTSErrorDetail &status/* @out */) = 0;
+
+         // @brief Cancel the speech
+         // @param speechid id of text to be cancelled