X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fdcaegen2-services-pmsh%2Ftestsuite%2Fdocker-compose.yml;h=a355c89cb895a5990514b6a0a221ee4ab773affa;hb=5e83a4b0e5e34aa81cb4c96dfabc4375ac0bf16e;hp=0ad8453ec06e49000f3a21cc79a2e15a3c207564;hpb=48496a511e8aa634c8b13ece136f7d63b659bdc1;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..a355c89c 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
+++ b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
@@ -3,70 +3,93 @@ 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:
-      pmsh-network:
+      net:
+        aliases:
+        - db
 
-  aai-sim:
+  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
+      LOG_LEVEL: "DEBUG"
     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
+      - ./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:
+      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
     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:
-
+      net:
+        aliases:
+        - cbs-sim
   mr-sim:
     container_name: mr-sim
-    image: mockserver/mockserver:mockserver-5.9.0
+    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/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:
+      net:
+        aliases:
+        - mr-sim
 
   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
+    ports:
+      - 8443:8443
     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:
+      net:
+        aliases:
+        - pmsh
 
 networks:
-  pmsh-network:
+  net:
     driver: bridge
+