X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdcaegen2-services-pmsh%2Ftestsuite%2Fdocker-compose.yml;fp=plans%2Fdcaegen2-services-pmsh%2Ftestsuite%2Fdocker-compose.yml;h=ed991c38b5f2989f484a4ad60f06822f3913ba65;hb=e207b42c4806d949ec9125116cbafc23698b77b3;hp=0ad8453ec06e49000f3a21cc79a2e15a3c207564;hpb=f9c37574899da91bd1117067e8d66d3269c79ddd;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 0ad8453e..ed991c38 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
+++ b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
@@ -18,8 +18,8 @@ services:
       MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
       MOCKSERVER_INITIALIZATION_JSON_PATH: /config/aai-initializer.json
     volumes:
-      - ./assets/mockserver.properties:/config/mockserver.properties
-      - ./assets/aai-initializer.json:/config/aai-initializer.json
+      - ./assets/aai_sim/aai_mockserver.properties:/config/mockserver.properties
+      - ./assets/aai_sim/aai-initializer.json:/config/aai-initializer.json
     networks:
       pmsh-network:
 
@@ -29,9 +29,13 @@ services:
     environment:
       MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
       MOCKSERVER_INITIALIZATION_JSON_PATH: /config/cbs-initializer.json
+      LOG_LEVEL: "DEBUG"
+      SERVER_PORT: 10443
     volumes:
-      - ./assets/mockserver.properties:/config/mockserver.properties
-      - ./assets/cbs-initializer.json:/config/cbs-initializer.json
+      - ./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:
       pmsh-network:
 
@@ -41,29 +45,32 @@ services:
     environment:
       MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
       MOCKSERVER_INITIALIZATION_JSON_PATH: /config/mr-initializer.json
+      LOG_LEVEL: "DEBUG"
+      SERVER_PORT: 3095
     volumes:
-      - ./assets/mockserver.properties:/config/mockserver.properties
-      - ./assets/mr-initializer.json:/config/mr-initializer.json
+      - ./assets/mr_sim/mr_mockserver.properties:/config/mockserver.properties
+      - ./assets/mr_sim/mr-initializer.json:/config/mr-initializer.json
     networks:
       pmsh-network:
 
   pmsh:
     container_name: pmsh
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.0.1
+    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: cbs-sim
-      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: aai-sim
-      AAI_SERVICE_PORT_AAI_SSL: 1080
+      AAI_SERVICE_PORT: 1080
+      DCAE_CA_CERTPATH: '/opt/app/pmsh/etc/certs/cacert.pem'
     networks:
       pmsh-network: