X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2%2Fprh-testcases%2Fresources%2Fdocker-compose.yml;h=bf50c7ab3232e54683996a97f9689c11e66c1fa6;hb=ee72614cc6fe35737d24db1c99ceb13b7e5e54fd;hp=bc42a94205e8aea75ef5070c72101a9b8fc209ed;hpb=dae804068897f1b1a6af5dcfec682a004a736a4e;p=integration%2Fcsit.git

diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index bc42a942..bf50c7ab 100644
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -1,64 +1,26 @@
-version: '3'
+version: "2.2"
 services:
   prh:
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
-    command: >
-        --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc
-        --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222
-        --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc
-        --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222
-        --aai.aaiClientConfiguration.aaiHostPortNumber=3333
-        --aai.aaiClientConfiguration.aaiHost=aai
-        --aai.aaiClientConfiguration.aaiProtocol=http
-    entrypoint:
-      - java
-      - -Dspring.profiles.active=dev
-      - -Dlogging.level.org.onap.dcaegen2.services.prh=TRACE
-      - -jar
-      - /opt/prh-app-server.jar
     ports:
       - "8100:8100"
       - "8433:8433"
+    volumes:
+      - ./simulator/certs:/tmp/certs
+      - ./prh_configs/prh_config_volume:/app-config
+    environment:
+      - HOSTNAME=dcae-prh
+      - CONSUL_HOST                # not in use, but still required by SDK - should be removed later on
+      - CONFIG_BINDING_SERVICE
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
     container_name: prh
     depends_on:
-     - dmaap-bc
-     - aai
+      dmaap-mr:
+        condition: service_started
+      aai:
+        condition: service_started
 
-  ssl_prh:
-      image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
-      command: >
-          --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc
-          --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2223
-          --dmaap.dmaapConsumerConfiguration.dmaapProtocol=https
-          --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc
-          --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2223
-          --dmaap.dmaapProducerConfiguration.dmaapProtocol=https
-          --aai.aaiClientConfiguration.aaiHostPortNumber=3334
-          --aai.aaiClientConfiguration.aaiHost=aai
-          --aai.aaiClientConfiguration.aaiProtocol=https
-          --security.enableAaiCertAuth=true
-          --security.enableDmaapCertAuth=true
-          --security.keyStorePath=/tmp/certs/org.onap.dcae.jks
-          --security.keyStorePasswordPath=/tmp/certs/keystore.password
-          --security.trustStorePath=/tmp/certs/org.onap.dcae.trust.jks
-          --security.trustStorePasswordPath=/tmp/certs/truststore.password
-      entrypoint:
-        - java
-        - -Dspring.profiles.active=dev
-        - -Dlogging.level.org.onap.dcaegen2.services.prh=TRACE
-        - -jar
-        - /opt/prh-app-server.jar
-      ports:
-        - "8200:8100"
-        - "8533:8433"
-      volumes:
-        - ./simulator/certs:/tmp/certs
-      container_name: ssl_prh
-      depends_on:
-       - dmaap-bc
-       - aai
-
-  dmaap-bc:
+  dmaap-mr:
     build:
       context: simulator
       dockerfile: DMaaP_simulator
@@ -69,11 +31,11 @@ services:
     container_name: dmaap_simulator
 
   aai:
-     build:
-       context: simulator
-       dockerfile: AAI_simulator
-     ports:
+    build:
+      context: simulator
+      dockerfile: AAI_simulator
+    ports:
       - "3333:3333"
       - "3334:3334"
       - "3335:3335"
-     container_name: aai_simulator
+    container_name: aai_simulator