Include correlationId in group lock.

Message prioritization optimization by checking and including  correlation Id, so that non related correlation message won't  get locked.

Optimized  Atomix Junit Test cases.

Issue-ID: CCSDK-2011
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: I090ed4c193c7f9af4014cfeee4c6208c12b542c1

2 files changed, 91 insertions, 9 deletions

diff --git a/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml b/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml
index a37089f10..020038c26 100644
--- a/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml
+++ b/ms/blueprintsprocessor/application/src/main/dc/docker-compose-cluster.yaml
@@ -9,7 +9,9 @@ services:
     ports:
       - "3306:3306"
     volumes:
-      - ~/vm_mysql:/var/lib/mysql
+      - target: /var/lib/mysql
+        type: volume
+        source: mysql-data
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: sdnctl
@@ -45,8 +47,8 @@ services:
         type: volume
         source: blueprints-deploy
       - target: /opt/app/onap/config
-        type: bind
-        source: ./config
+        type: volume
+        source: controller-config
     environment:
       # Same as hostname and container name
       CLUSTER_ENABLED: "true"
@@ -79,8 +81,8 @@ services:
         type: volume
         source: blueprints-deploy
       - target: /opt/app/onap/config
-        type: bind
-        source: ./config
+        type: volume
+        source: resource-resolution-config
     environment:
       CLUSTER_ENABLED: "true"
       CLUSTER_ID: cds-cluster
@@ -94,8 +96,60 @@ services:
       APP_CONFIG_HOME: /opt/app/onap/config
       STICKYSELECTORKEY:
       ENVCONTEXT: dev
+  py-executor-0:
+    depends_on:
+      - db
+      - nats
+    image: onap/ccsdk-py-executor
+    container_name: py-executor-0
+    hostname: py-executor-0
+    networks:
+      - cds-network
+    ports:
+      - "50052:50052"
+    restart: always
+    volumes:
+      - target: /opt/app/onap/blueprints/deploy
+        type: volume
+        source: blueprints-deploy
+    environment:
+      CLUSTER_ID: cds-cluster
+      CLUSTER_NODE_ID: py-executor-0
+      CLUSTER_MEMBERS: cds-controller-0,resource-resolution-0,py-executor-0
+      NATS_HOSTS: nats://nats:4222
+      APPLICATIONNAME: py-executor
+      BUNDLEVERSION: 1.0.0
+      APP_CONFIG_HOME: /opt/app/onap/config
+      STICKYSELECTORKEY:
+      ENVCONTEXT: dev
+      APP_PORT: 50052
+      AUTH_TYPE: tls-auth
+      LOG_FILE: /opt/app/onap/logs/application.log
 volumes:
+  mysql-data:
+    driver: local
+    driver_opts:
+      type: none
+      device: /opt/app/cds/mysql/data
+      o: bind
   blueprints-deploy:
+    driver: local
+    driver_opts:
+      type: none
+      device: /opt/app/cds/blueprints/deploy
+      o: bind
+  controller-config:
+    driver: local
+    driver_opts:
+      type: none
+      device: /opt/app/cds/cds-controller/config
+      o: bind
+  resource-resolution-config:
+    driver: local
+    driver_opts:
+      type: none
+      device: /opt/app/cds/resource-resolution/config
+      o: bind
 
 networks:
   cds-network:
diff --git a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml
index d87770286..20b17bc90 100755
--- a/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml
+++ b/ms/blueprintsprocessor/application/src/main/dc/docker-compose.yaml
@@ -9,7 +9,9 @@ services:
     ports:
       - "3306:3306"
     volumes:
-      - ~/vm_mysql:/var/lib/mysql
+      - target: /var/lib/mysql
+        type: volume
+        source: mysql-data
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: sdnctl
@@ -29,7 +31,12 @@ services:
       - "9111:9111"
     restart: always
     volumes:
-      - blueprints-deploy:/opt/app/onap/blueprints/deploy
+      - target: /opt/app/onap/blueprints/deploy
+        type: volume
+        source: blueprints-deploy
+      - target: /opt/app/onap/config
+        type: volume
+        source: controller-config
     environment:
       APPLICATIONNAME: cds-controller
       BUNDLEVERSION: 1.0.0
@@ -47,7 +54,9 @@ services:
       - "50051:50051"
     restart: always
     volumes:
-      - blueprints-deploy:/opt/app/onap/blueprints/deploy
+      - target: /opt/app/onap/blueprints/deploy
+        type: volume
+        source: blueprints-deploy
   py-executor-default:
     depends_on:
       - db
@@ -60,7 +69,9 @@ services:
       - "50052:50052"
     restart: always
     volumes:
-      - blueprints-deploy:/opt/app/onap/blueprints/deploy
+      - target: /opt/app/onap/blueprints/deploy
+        type: volume
+        source: blueprints-deploy
     environment:
       APPLICATIONNAME: py-executor
       BUNDLEVERSION: 1.0.0
@@ -72,7 +83,24 @@ services:
       LOG_FILE: /opt/app/onap/logs/application.log
 
 volumes:
+  mysql-data:
+    driver: local
+    driver_opts:
+      type: none
+      device: /opt/app/cds/mysql/data
+      o: bind
   blueprints-deploy:
+    driver: local
+    driver_opts:
+      type: none
+      device: /opt/app/cds/blueprints/deploy
+      o: bind
+  controller-config:
+    driver: local
+    driver_opts:
+      type: none
+      device: /opt/app/cds/cds-controller/config
+      o: bind
 
 networks:
   cds-network: