Merge branch 'master' into hotfix/macOS-ninja-build

# Conflicts: # .github/workflows/macos.yml
apache · Dec 25, 2023 · b737015 · b737015
2 parents ddce574 + d62eeef
commit b737015
Show file tree

Hide file tree

Showing 219 changed files with 336 additions and 27,846 deletions.
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
@@ -26,7 +26,6 @@ jobs:
             cmake \
             libffi-dev \
             libxml2-dev \
-            libczmq-dev \
             libcpputest-dev \
             rapidjson-dev \
             libavahi-compat-libdnssd-dev \

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -75,7 +75,7 @@ jobs:
         uses: actions/[email protected]
       - name: Install dependencies
         run: |
-          brew install lcov zeromq czmq cpputest jansson rapidjson libzip ccache ninja
+          brew install lcov cpputest jansson rapidjson libzip ccache ninja
       - name: Prepare ccache timestamp
         id: ccache_cache_timestamp
         run: |

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -119,7 +119,6 @@ jobs:
           cmake \
           libffi-dev \
           libxml2-dev \
-          libczmq-dev \
           libcpputest-dev \
           rapidjson-dev \
           libavahi-compat-libdnssd-dev \

diff --git a/bundles/CMakeLists.txt b/bundles/CMakeLists.txt
@@ -20,6 +20,5 @@ add_subdirectory(http_admin)
 add_subdirectory(logging)
 add_subdirectory(shell)
 add_subdirectory(remote_services)
-add_subdirectory(pubsub)
 add_subdirectory(cxx_remote_services)
 add_subdirectory(components_ready_check)
diff --git a/bundles/cxx_remote_services/integration/CMakeLists.txt b/bundles/cxx_remote_services/integration/CMakeLists.txt
@@ -20,14 +20,8 @@ if (CXX_RSA_INTEGRATION)
     add_celix_bundle(TestExportImportRemoteServiceFactory
             SOURCES src/TestExportImportRemoteServiceFactory.cc
             )
-    target_link_libraries(TestExportImportRemoteServiceFactory PRIVATE Celix::rsa_spi Celix::pubsub_api Celix::Promises Celix::PushStreams Celix::log_helper)
+    target_link_libraries(TestExportImportRemoteServiceFactory PRIVATE Celix::rsa_spi Celix::Promises Celix::PushStreams Celix::log_helper)
     target_include_directories(TestExportImportRemoteServiceFactory PRIVATE include)
-    celix_bundle_files(TestExportImportRemoteServiceFactory
-            resources/Calculator$add$Invoke.descriptor
-            resources/Calculator$result$Event.descriptor
-            resources/Calculator$add$Return.descriptor
-            DESTINATION "META-INF/descriptors"
-            )
 
     add_celix_bundle(CalculatorProvider
             SOURCES src/CalculatorProvider.cc
@@ -47,55 +41,36 @@ if (CXX_RSA_INTEGRATION)
     endif()
 
     ################# Integration examples ##################################
+    add_celix_container(RemoteCalculatorProvider
+        CXX
+        GROUP rsa
+        PROPERTIES
+            CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=debug
+        BUNDLES
+            Celix::ShellCxx
+            Celix::shell_tui
 
-    if (BUILD_LAUNCHER)
-        add_celix_container(RemoteCalculatorProvider
-                LAUNCHER Celix::launcher
-                GROUP rsa
-                USE_CONFIG
-                PROPERTIES
-                CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
-                BUNDLES
-                Celix::ShellCxx
-                Celix::shell_tui
-
-                #Pubsub needed for remote services on pubsub
-                Celix::celix_pubsub_serializer_json
-                Celix::celix_pubsub_topology_manager
-                Celix::celix_pubsub_admin_zmq
-                Celix::celix_pubsub_protocol_wire_v2
-                Celix::celix_pubsub_discovery_etcd
-
-                #Remote Services
-                Celix::RemoteServiceAdmin
-                TestExportImportRemoteServiceFactory #needed to be able to create a ExportedService for ICalculator
-
-                CalculatorProvider
-        )
+            #Remote Services
+            Celix::RemoteServiceAdmin
+            TestExportImportRemoteServiceFactory #needed to be able to create a ExportedService for ICalculator
 
-        add_celix_container(RemoteCalculatorConsumer
-                LAUNCHER Celix::launcher
-                GROUP rsa
-                USE_CONFIG
-                PROPERTIES
-                CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
-                BUNDLES
-                Celix::ShellCxx
-                Celix::shell_tui
+            CalculatorProvider
+    )
 
-                #Pubsub needed for remote services on pubsub
-                Celix::celix_pubsub_serializer_json
-                Celix::celix_pubsub_topology_manager
-                Celix::celix_pubsub_discovery_etcd
-                Celix::celix_pubsub_admin_zmq
-                Celix::celix_pubsub_protocol_wire_v2
+    add_celix_container(RemoteCalculatorConsumer
+        CXX
+        GROUP rsa
+        PROPERTIES
+            CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=debug
+        BUNDLES
+            Celix::ShellCxx
+            Celix::shell_tui
 
-                #Remote Services
-                Celix::RsaConfiguredDiscovery
-                Celix::RemoteServiceAdmin
-                TestExportImportRemoteServiceFactory #needed to be able to create a ExportedService for ICalculator
+            #Remote Services
+            Celix::RsaConfiguredDiscovery
+            Celix::RemoteServiceAdmin
+            TestExportImportRemoteServiceFactory #needed to be able to create a ExportedService for ICalculator
 
-                CalculatorConsumer
-        )
-    endif ()
+            CalculatorConsumer
+    )
 endif()
diff --git a/bundles/cxx_remote_services/integration/README.md b/bundles/cxx_remote_services/integration/README.md
@@ -0,0 +1,8 @@
+# C++ Remote Service Amdatu Integration
+
+This project part tests the integration of the C++ Remote Service Admin implementation with the 
+C++ configuration-based remote service discovery. 
+
+Because the C++ Remote Service Admin is based on export and import service factories and does not directly 
+implement a transportation or serializer technology, the integration tests are based on a simple implementation of
+inter process communication message queue (IPC mq) for transportation and a simple memcpy for serialization.
diff --git a/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt b/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt
@@ -22,28 +22,13 @@ target_link_libraries(test_cxx_remote_services_integration PRIVATE Celix::framew
 target_include_directories(test_cxx_remote_services_integration PRIVATE ../include) #Add ICalculator
 
 add_celix_bundle_dependencies(test_cxx_remote_services_integration
-    Celix::celix_pubsub_serializer_json
-    Celix::celix_pubsub_topology_manager
-    Celix::celix_pubsub_admin_zmq
-    Celix::celix_pubsub_protocol_wire_v2
     Celix::RsaConfiguredDiscovery
     Celix::RemoteServiceAdmin
     TestExportImportRemoteServiceFactory
     CalculatorProvider
     CalculatorConsumer
 )
 
-celix_get_bundle_file(Celix::celix_pubsub_serializer_json PS_SER_BUNDLE_LOC)
-target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_SER_BUNDLE_LOC="${PS_SER_BUNDLE_LOC}")
-
-celix_get_bundle_file(Celix::celix_pubsub_topology_manager PS_PSTM_BUNDLE_LOC)
-target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_PSTM_BUNDLE_LOC="${PS_PSTM_BUNDLE_LOC}")
-
-celix_get_bundle_file(Celix::celix_pubsub_admin_zmq PS_PSA_BUNDLE_LOC)
-target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_PSA_BUNDLE_LOC="${PS_PSA_BUNDLE_LOC}")
-
-celix_get_bundle_file(Celix::celix_pubsub_protocol_wire_v2 PS_WIRE_BUNDLE_LOC)
-target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_WIRE_BUNDLE_LOC="${PS_WIRE_BUNDLE_LOC}")
 
 celix_get_bundle_file(Celix::RsaConfiguredDiscovery RS_DISCOVERY_BUNDLE_LOC)
 target_compile_definitions(test_cxx_remote_services_integration PRIVATE RS_DISCOVERY_BUNDLE_LOC="${RS_DISCOVERY_BUNDLE_LOC}")

diff --git a/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc b/bundles/cxx_remote_services/integration/gtest/src/RemoteServicesIntegrationTestSuite.cc
@@ -26,36 +26,23 @@
 class RemoteServicesIntegrationTestSuite : public ::testing::Test {
 public:
     RemoteServicesIntegrationTestSuite() {
-        auto pubsubTestReturnIpc = std::string{"ipc:///tmp/pubsub-test-return"};
-        auto pubsubTestInvokeIpc = std::string{"ipc:///tmp/pubsub-test-invoke"};
-
         celix::Properties clientConfig{
                 {"CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL", "info"},
                 {celix::FRAMEWORK_CACHE_DIR, ".clientCache"},
-                //Static configuration to let the pubsub zmq operate without discovery
-                {"PSA_ZMQ_STATIC_BIND_URL_FOR_test_invoke_default", pubsubTestInvokeIpc},
-                {"PSA_ZMQ_STATIC_CONNECT_URL_FOR_test_return_default", pubsubTestReturnIpc }
         };
         clientFw = celix::createFramework(clientConfig);
         clientCtx = clientFw->getFrameworkBundleContext();
 
         celix::Properties serverConfig{
                 {"CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL", "info"},
                 {celix::FRAMEWORK_CACHE_DIR, ".serverCache"},
-                //Static configuration to let the pubsub zmq operate without discovery
-                {"PSA_ZMQ_STATIC_BIND_URL_FOR_test_return_default",  pubsubTestReturnIpc },
-                {"PSA_ZMQ_STATIC_CONNECT_URL_FOR_test_invoke_default", pubsubTestInvokeIpc }
         };
         serverFw = celix::createFramework(serverConfig);
         serverCtx = serverFw->getFrameworkBundleContext();
     }
 
     static void installSharedBundles(std::shared_ptr<celix::BundleContext>& ctx) {
         auto sharedBundles = {
-                PS_SER_BUNDLE_LOC,
-                PS_PSTM_BUNDLE_LOC,
-                PS_PSA_BUNDLE_LOC,
-                PS_WIRE_BUNDLE_LOC,
                 RS_DISCOVERY_BUNDLE_LOC,
                 RS_FACTORY_BUNDLE_LOC ,
                 RS_RSA_BUNDLE_LOC};
@@ -87,9 +74,6 @@ class RemoteServicesIntegrationTestSuite : public ::testing::Test {
     }
 
     void invokeRemoteCalcService() {
-        installProviderBundles();
-        installConsumerBundles();
-
         //If a calculator provider bundle is installed I expect a exported calculator interface
         auto count = serverCtx->useService<ICalculator>()
                 .setFilter("(service.exported.interfaces=*)")
@@ -111,8 +95,8 @@ class RemoteServicesIntegrationTestSuite : public ::testing::Test {
 
         /*
          * Testing the remote service in a while loop till it is successful or 10 seconds has passed.
-         * Note that because pubsub does not guarantee a connection when used, it is possible - and likely -
-         * that the first remote test iteration fails due to not yet completely connected pubsub.
+         * Note that because mq does not guarantee a connection when used, it is possible - and likely -
+         * that the first remote test iteration fails due to not yet completely connected mq.
          */
         auto start = std::chrono::system_clock::now();
         auto now = std::chrono::system_clock::now();
@@ -169,5 +153,7 @@ TEST_F(RemoteServicesIntegrationTestSuite, StartStopFrameworks) {
 }
 
 TEST_F(RemoteServicesIntegrationTestSuite, InvokeRemoteCalcService) {
+    installProviderBundles();
+    installConsumerBundles();
     invokeRemoteCalcService();
 }
diff --git a/bundles/cxx_remote_services/integration/resources/Calculator$add$Invoke.descriptor b/bundles/cxx_remote_services/integration/resources/Calculator$add$Invoke.descriptor
diff --git a/bundles/cxx_remote_services/integration/resources/Calculator$add$Return.descriptor b/bundles/cxx_remote_services/integration/resources/Calculator$add$Return.descriptor
diff --git a/bundles/cxx_remote_services/integration/resources/Calculator$result$Event.descriptor b/bundles/cxx_remote_services/integration/resources/Calculator$result$Event.descriptor
diff --git a/bundles/cxx_remote_services/integration/resources/endpoint_discovery.json b/bundles/cxx_remote_services/integration/resources/endpoint_discovery.json
@@ -4,12 +4,12 @@
       "endpoint.id": "id-01",
       "service.imported": true,
       "service.imported.configs": [
-        "pubsub"
+        "ipc-mq"
       ],
       "service.exported.interfaces": "ICalculator",
       "endpoint.objectClass": "ICalculator",
-      "endpoint.topic": "test",
-      "endpoint.scope": "default"
+      "endpoint.client.to.provider.channel.id": "1234",
+      "endpoint.provider.to.client.channel.id": "1235"
     }
   ]
 }
diff --git a/bundles/cxx_remote_services/integration/src/CalculatorConsumer.cc b/bundles/cxx_remote_services/integration/src/CalculatorConsumer.cc
@@ -46,7 +46,6 @@ class CalculatorConsumer final : public celix::IShellCommand {
                 });
         counter++;
     }
-
 private:
     std::shared_ptr<ICalculator> calculator{};
 };

diff --git a/bundles/cxx_remote_services/integration/src/CalculatorProvider.cc b/bundles/cxx_remote_services/integration/src/CalculatorProvider.cc
@@ -60,7 +60,7 @@ class CalculatorImpl final : public ICalculator {
             while(!stopThread) {
                 ses->publish((double)counter);
                 counter++;
-                std::this_thread::sleep_for(std::chrono::milliseconds{100});
+                std::this_thread::sleep_for(std::chrono::milliseconds{5000});
             }
         });
         return CELIX_SUCCESS;
@@ -98,8 +98,8 @@ class CalculatorProviderActivator {
             .setCallbacks(&CalculatorImpl::setPushStreamProvider);
         cmp.createProvidedService<ICalculator>()
                 .addProperty("service.exported.interfaces", celix::typeName<ICalculator>())
-                .addProperty("endpoint.topic", "test")
-                .addProperty("endpoint.scope", "default")
+                .addProperty("endpoint.client.to.provider.channel.id", "1234")
+                .addProperty("endpoint.provider.to.client.channel.id", "1235")
                 .addProperty("service.exported.intents", "osgi.async");
 
         cmp.setCallbacks(&CalculatorImpl::init, &CalculatorImpl::start, &CalculatorImpl::stop, &CalculatorImpl::deinit);
-Original file line number
+Diff line change
@@ Expand Up @@
                     });
             counter++;
         }
     private:
         std::shared_ptr<ICalculator> calculator{};
     };
@@ Expand Down @@