[PMSH] Update CSITs to use DMaaP MR

[integration/csit.git] / plans / dcaegen2-services-pmsh / testsuite / docker-compose.yml

diff --git a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
index 4ea89dc..6541ddb 100644 (file)
--- a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
+++ b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
@@ -1,18 +1,6 @@
 version: '3.3'
 
 services:
-  mockserver:
-    container_name: mockserver
-    image: mockserver/mockserver:mockserver-5.9.0
-    environment:
-      MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
-      MOCKSERVER_INITIALIZATION_JSON_PATH: /config/initializerJson.json
-    volumes:
-      - ./assets/mockserver.properties:/config/mockserver.properties
-      - ./assets/initializerJson.json:/config/initializerJson.json
-    networks:
-      pmsh-network:
-
   db:
     container_name: db
     image: postgres
@@ -21,28 +9,68 @@ services:
       POSTGRES_PASSWORD: $DB_PASSWORD
       POSTGRES_USER: $DB_USER
     networks:
-      pmsh-network:
+      dockercompose_net:
+        aliases:
+        - db
+
+  aai:
+    container_name: aai-sim
+    image: mockserver/mockserver:mockserver-5.9.0
+    environment:
+      MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
+      MOCKSERVER_INITIALIZATION_JSON_PATH: /config/aai-initializer.json
+      LOG_LEVEL: "DEBUG"
+    volumes:
+      - ./assets/aai_sim/aai_mockserver.properties:/config/mockserver.properties
+      - ./assets/aai_sim/aai-initializer.json:/config/aai-initializer.json
+      - ./assets/ssl_certs/mock_server_cacert.pem:/var/tmp/mock_server_cacert.pem
+      - ./assets/ssl_certs/mock_server_key.pem:/var/tmp/mock_server_key.pem
+    networks:
+      dockercompose_net:
+        aliases:
+        - aai-sim
+
+  cbs-sim:
+    container_name: cbs-sim
+    image: mockserver/mockserver:mockserver-5.9.0
+    environment:
+      MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
+      MOCKSERVER_INITIALIZATION_JSON_PATH: /config/cbs-initializer.json
+      LOG_LEVEL: "DEBUG"
+      SERVER_PORT: 10443
+    volumes:
+      - ./assets/cbs_sim/cbs_mockserver.properties:/config/mockserver.properties
+      - ./assets/cbs_sim/cbs-initializer.json:/config/cbs-initializer.json
+      - ./assets/ssl_certs/mock_server_cacert.pem:/var/tmp/mock_server_cacert.pem
+      - ./assets/ssl_certs/mock_server_key.pem:/var/tmp/mock_server_key.pem
+    networks:
+      dockercompose_net:
+        aliases:
+        - cbs-sim
 
   pmsh:
     container_name: pmsh
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:latest
     depends_on:
       - db
     volumes:
-      - ./assets/cert.pem:/opt/app/pmsh/etc/certs/cert.pem
-      - ./assets/key.pem:/opt/app/pmsh/etc/certs/key.pem
+      - ./assets/ssl_certs/cert.pem:/opt/app/pmsh/etc/certs/cert.pem
+      - ./assets/ssl_certs/key.pem:/opt/app/pmsh/etc/certs/key.pem
+      - ./assets/ssl_certs/mock_server_cacert.pem:/opt/app/pmsh/etc/certs/cacert.pem
     environment:
       HOSTNAME: "dcae-pmsh"
-      CONFIG_BINDING_SERVICE_SERVICE_HOST: mockserver
-      CONFIG_BINDING_SERVICE_SERVICE_PORT: 1080
+      CONFIG_BINDING_SERVICE: cbs-sim
       PMSH_PG_URL: db
       PMSH_PG_USERNAME: $DB_USER
       PMSH_PG_PASSWORD: $DB_PASSWORD
-      AAI_SERVICE_HOST: mockserver
-      AAI_SERVICE_PORT_AAI_SSL: 1080
+      AAI_SERVICE_PORT: 1080
+      DCAE_CA_CERTPATH: '/opt/app/pmsh/etc/certs/cacert.pem'
     networks:
-      pmsh-network:
+      dockercompose_net:
+        aliases:
+        - pmsh
 
 networks:
-  pmsh-network:
-    driver: bridge
+  dockercompose_net:
+    external: true
+