Changed the default multicast address.

There's an issue with macOS when docker is installed and a multicast
address different than 224.0.0.1 is used.
https://stackoverflow.com/questions/46341715/hazelcast-multicast-does-not-work-because-of-vboxnet-which-is-used-by-docker-mac

Re-organized the test hazelcast yaml since we now fill the cluster-name
and instance-name information from the ClusterInfo object during
creation. No need to pass it in the config file anymore. This is causing
every file to be the exact same thus the consolidation.

Also fix an issue with test case using the same hazelcast service in two
different threads causing intermittent issue during the build process.

Issue-ID: CCSDK-2119
Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca>
Change-Id: I7f8328bfd93cdcabe8ab2fa844cbf9dd57f1493a

diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazlecastClusterServiceTest.kt b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazlecastClusterServiceTest.kt
index b298eac..80cf415 100644 (file)
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazlecastClusterServiceTest.kt
+++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/cluster/HazlecastClusterServiceTest.kt
@@ -113,7 +113,7 @@ class HazlecastClusterServiceTest {
                         } else {
                             ClusterInfo(
                                 id = "test-cluster", nodeId = nodeId, joinAsClient = false,
-                                configFile = "./src/test/resources/hazelcast/hazelcast-$port.yaml",
+                                configFile = "./src/test/resources/hazelcast/hazelcast-cluster.yaml",
                                 properties = properties
                             )
                         }
@@ -162,7 +162,7 @@ class HazlecastClusterServiceTest {
                 executeLock(bluePrintClusterServices[0], "first", lockName)
             }
             val deferred2 = async {
-                executeLock(bluePrintClusterServices[0], "second", lockName)
+                executeLock(bluePrintClusterServices[1], "second", lockName)
             }
             val deferred3 = async {
                 executeLock(bluePrintClusterServices[2], "third", lockName)

diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5679.yaml b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5679.yaml
deleted file mode 100644 (file)
index e7ac273..0000000
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5679.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-hazelcast:
-  cluster-name: ${CLUSTER_ID}
-  instance-name: node-5679
-  lite-member:
-    enabled: false
-  cp-subsystem:
-    cp-member-count: 3
-    group-size: 3
-    session-time-to-live-seconds: 60
-    session-heartbeat-interval-seconds: 5
-    missing-cp-member-auto-removal-seconds: 120
-#  network:
-#    join:
-#      multicast:
-#        enabled: false
-#      kubernetes:
-#        enabled: true
-#        namespace: MY-KUBERNETES-NAMESPACE
-#        service-name: MY-SERVICE-NAME
-#        service-label-name: MY-SERVICE-LABEL-NAME
-#        service-label-value: MY-SERVICE-LABEL-VALUE
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5680.yaml b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5680.yaml
deleted file mode 100644 (file)
index cb493d1..0000000
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5680.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-hazelcast:
-  cluster-name: ${CLUSTER_ID}
-  instance-name: node-5680
-  lite-member:
-    enabled: false
-  cp-subsystem:
-    cp-member-count: 3
-    group-size: 3
-    session-time-to-live-seconds: 60
-    session-heartbeat-interval-seconds: 5
-    missing-cp-member-auto-removal-seconds: 120
-#  network:
-#    join:
-#      multicast:
-#        enabled: false
-#      kubernetes:
-#        enabled: true
-#        namespace: MY-KUBERNETES-NAMESPACE
-#        service-name: MY-SERVICE-NAME
-#        service-label-name: MY-SERVICE-LABEL-NAME
-#        service-label-value: MY-SERVICE-LABEL-VALUE
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5681.yaml b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5681.yaml
deleted file mode 100644 (file)
index e60b0c5..0000000
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5681.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-hazelcast:
-  cluster-name: ${CLUSTER_ID}
-  instance-name: node-5681
-  lite-member:
-    enabled: false
-  cp-subsystem:
-    cp-member-count: 3
-    group-size: 3
-    session-time-to-live-seconds: 60
-    session-heartbeat-interval-seconds: 5
-    missing-cp-member-auto-removal-seconds: 120
-#  network:
-#    join:
-#      multicast:
-#        enabled: false
-#      kubernetes:
-#        enabled: true
-#        namespace: MY-KUBERNETES-NAMESPACE
-#        service-name: MY-SERVICE-NAME
-#        service-label-name: MY-SERVICE-LABEL-NAME
-#        service-label-value: MY-SERVICE-LABEL-VALUE
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5682.yaml b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5682.yaml
index 3cb10a0..859ea33 100644 (file)
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5682.yaml
+++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-5682.yaml
@@ -9,10 +9,11 @@ hazelcast:
     session-time-to-live-seconds: 60
     session-heartbeat-interval-seconds: 5
     missing-cp-member-auto-removal-seconds: 120
-#  network:
-#    join:
-#      multicast:
-#        enabled: false
+  network:
+    join:
+      multicast:
+        enabled: true
+        multicast-group: 224.0.0.1
 #      kubernetes:
 #        enabled: true
 #        namespace: MY-KUBERNETES-NAMESPACE

diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-cluster.yaml b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-cluster.yaml
new file mode 100644 (file)
index 0000000..de6047a
--- /dev/null
+++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/test/resources/hazelcast/hazelcast-cluster.yaml
@@ -0,0 +1,23 @@
+hazelcast:
+  lite-member:
+    enabled: false
+  cp-subsystem:
+    cp-member-count: 3
+    group-size: 3
+    session-time-to-live-seconds: 60
+    session-heartbeat-interval-seconds: 5
+    missing-cp-member-auto-removal-seconds: 120
+  network:
+          join:
+            multicast:
+              enabled: true
+              # Specify 224.0.0.1 instead of default 224.2.2.3 since there's some issue
+              # on macOs with docker installed and multicast address different than 224.0.0.1
+              # https://stackoverflow.com/questions/46341715/hazelcast-multicast-does-not-work-because-of-vboxnet-which-is-used-by-docker-mac
+              multicast-group: 224.0.0.1
+          #      kubernetes:
+          #        enabled: true
+          #        namespace: MY-KUBERNETES-NAMESPACE
+          #        service-name: MY-SERVICE-NAME
+          #        service-label-name: MY-SERVICE-LABEL-NAME
+          #        service-label-value: MY-SERVICE-LABEL-VALUE