Merge "Add support for ODL credentials that have changed"

[integration.git] / test / csit / tests / dcaegen2 / prh-testcases / resources / docker-compose.yml

diff --git a/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index e773b76..67921e8 100644 (file)
--- a/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -1,12 +1,15 @@
 version: '3'
 services:
   prh:
-    image: nexus3.onap.org:10003/onap/org.onap.dcaegen2.services.prh.prh-app-server
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
     command: >
-          --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222
-          --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222
-          --aai.aaiClientConfiguration.aaiHostPortNumber=3333
-          --aai.aaiClientConfiguration.aaiProtocol=http
+        --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap
+        --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222
+        --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap
+        --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222
+        --aai.aaiClientConfiguration.aaiHostPortNumber=3333
+        --aai.aaiClientConfiguration.aaiHost=aai
+        --aai.aaiClientConfiguration.aaiProtocol=http
     entrypoint:
       - java
       - -Dspring.profiles.active=dev
@@ -17,28 +20,22 @@ services:
       - "8100:8100"
       - "8433:8433"
     container_name: prh
-   
-  dmaap_simulator:
+    depends_on:
+     - dmaap
+     - aai
+
+  dmaap:
     build:
       context: simulator
       dockerfile: DMaaP_simulator
-      args:
-        - https_proxy=${HTTPS_PROXY}
     ports:
       - "2222:2222"
     container_name: dmaap_simulator
-    depends_on:
-      - prh
-      
-  aai_simulator:
+
+  aai:
      build:
        context: simulator
        dockerfile: AAI_simulator
-       args:
-         - https_proxy=${HTTPS_PROXY}
      ports:
       - "3333:3333"
      container_name: aai_simulator
-     depends_on:
-       - prh
-