X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdcaegen2-services-pmsh%2Ftestsuite%2Fdocker-compose.yml;h=5c37f448be31b8781b3f47b1dc1ee0430300a41a;hb=807c7cd1e65eedb7d3645adfe57f4643181302dc;hp=6541ddbfb7bb8728b67bc43a0fd7daa14729435b;hpb=59e273488c6159dae28b7318bf2a4bbf26e6937b;p=integration%2Fcsit.git

diff --git a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
index 6541ddbf..5c37f448 100644
--- 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,51 +26,53 @@ 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
+  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/cbs-initializer.json
-      LOG_LEVEL: "DEBUG"
-      SERVER_PORT: 10443
+      MOCKSERVER_INITIALIZATION_JSON_PATH: /config/mr-initializer.json
     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
+      - ./assets/mr_sim/mr_mockserver.properties:/config/mockserver.properties
+      - ./assets/mr_sim/mr-initializer.json:/config/mr-initializer.json
     networks:
-      dockercompose_net:
+      net:
         aliases:
-        - cbs-sim
+        - 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
       - ./assets/ssl_certs/mock_server_cacert.pem:/opt/app/pmsh/etc/certs/cacert.pem
+      - ./assets/cbs_sim/application_config.yaml:/app-config/application_config.yaml
     environment:
       HOSTNAME: "dcae-pmsh"
-      CONFIG_BINDING_SERVICE: cbs-sim
       PMSH_PG_URL: db
       PMSH_PG_USERNAME: $DB_USER
       PMSH_PG_PASSWORD: $DB_PASSWORD
       AAI_SERVICE_PORT: 1080
       DCAE_CA_CERTPATH: '/opt/app/pmsh/etc/certs/cacert.pem'
+      CBS_CLIENT_CONFIG_PATH: '/app-config/application_config.yaml'
     networks:
-      dockercompose_net:
+      net:
         aliases:
         - pmsh
 
 networks:
-  dockercompose_net:
-    external: true
+  net:
+    driver: bridge