[DCAE-PMSH] Removing dmaap mr from suite

[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 6541ddb..a355c89 100644 (file)
--- a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
+++ b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
@@ -3,19 +3,19 @@ version: '3.3'
 services:
   db:
     container_name: db
-    image: postgres
+    image: nexus3.onap.org:10001/library/postgres:10
     restart: always
     environment:
       POSTGRES_PASSWORD: $DB_PASSWORD
       POSTGRES_USER: $DB_USER
     networks:
-      dockercompose_net:
+      net:
         aliases:
         - db
 
   aai:
     container_name: aai-sim
-    image: mockserver/mockserver:mockserver-5.9.0
+    image: nexus3.onap.org:10001/mockserver/mockserver:latest
     environment:
       MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
       MOCKSERVER_INITIALIZATION_JSON_PATH: /config/aai-initializer.json
@@ -26,33 +26,52 @@ services:
       - ./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:
+      net:
         aliases:
         - aai-sim
 
   cbs-sim:
     container_name: cbs-sim
-    image: mockserver/mockserver:mockserver-5.9.0
+    image: nexus3.onap.org:10001/mockserver/mockserver:latest
+    command: -logLevel DEBUG -serverPort 10443
+    ports:
+      - 10443:1080
     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:
+      net:
         aliases:
         - cbs-sim
+  mr-sim:
+    container_name: mr-sim
+    image: nexus3.onap.org:10001/mockserver/mockserver:latest
+    command: -logLevel DEBUG -serverPort 3904
+    ports:
+      - 3904:1080
+    environment:
+      MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
+      MOCKSERVER_INITIALIZATION_JSON_PATH: /config/mr-initializer.json
+    volumes:
+      - ./assets/mr_sim/mr_mockserver.properties:/config/mockserver.properties
+      - ./assets/mr_sim/mr-initializer.json:/config/mr-initializer.json
+    networks:
+      net:
+        aliases:
+        - mr-sim
 
   pmsh:
     container_name: pmsh
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:latest
     depends_on:
       - db
+    ports:
+      - 8443:8443
     volumes:
       - ./assets/ssl_certs/cert.pem:/opt/app/pmsh/etc/certs/cert.pem
       - ./assets/ssl_certs/key.pem:/opt/app/pmsh/etc/certs/key.pem
@@ -66,11 +85,11 @@ services:
       AAI_SERVICE_PORT: 1080
       DCAE_CA_CERTPATH: '/opt/app/pmsh/etc/certs/cacert.pem'
     networks:
-      dockercompose_net:
+      net:
         aliases:
         - pmsh
 
 networks:
-  dockercompose_net:
-    external: true
+  net:
+    driver: bridge