Fix robot cases due to attachment-point

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

diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index 863a427..0400e87 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -1,7 +1,7 @@
-version: "3"
+version: "2.2"
 services:
   prh:
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.4-SNAPSHOT
     ports:
       - "8100:8100"
       - "8433:8433"
@@ -10,12 +10,15 @@ services:
       - PRH_LOG_LEVEL
     container_name: prh
     depends_on:
-      - cbs
-      - dmaap-mr
-      - aai
+      cbs:
+        condition: service_healthy
+      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
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.4-SNAPSHOT
     ports:
       - "8200:8100"
       - "8533:8433"
@@ -29,9 +32,12 @@ services:
       - CONFIG_BINDING_SERVICE
     container_name: ssl_prh
     depends_on:
-      - cbs
-      - dmaap-mr
-      - aai
+      cbs:
+        condition: service_healthy
+      dmaap-mr:
+        condition: service_started
+      aai:
+        condition: service_started
 
   dmaap-mr:
     build:
@@ -60,6 +66,7 @@ services:
     command: ["agent", "-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
     volumes:
       - ./consul.d/:/consul/consul.d
+    container_name: consul
 
   consul-cfg:
     image: consul:1.0.6
@@ -67,7 +74,7 @@ services:
     command: ["kv", "put", "-http-addr=http://consul:8500", "dcae-prh", '{
                                               "dmaap.dmaapConsumerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT",
                                               "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-mr",
-                                              "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223,
+                                              "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2222,
                                               "dmaap.dmaapConsumerConfiguration.dmaapTopicName": "events/unauthenticated.VES_PNFREG_OUTPUT",
                                               "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http",
                                               "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin",
@@ -80,7 +87,7 @@ services:
 
                                               "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY",
                                               "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr",
-                                              "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223,
+                                              "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2222,
                                               "dmaap.dmaapProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_READY",
                                               "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http",
                                               "dmaap.dmaapProducerConfiguration.dmaapUserName":"admin",
@@ -89,14 +96,14 @@ services:
 
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-mr",
-                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223,
+                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2222,
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_UPDATE",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "http",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
                                               "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
 
-                                              "aai.aaiClientConfiguration.pnfUrl":"https://aai:3333/aai/v12/network/pnfs/pnf",
+                                              "aai.aaiClientConfiguration.pnfUrl":"https://aai:3334/aai/v12/network/pnfs/pnf",
                                               "aai.aaiClientConfiguration.aaiHost":"aai",
                                               "aai.aaiClientConfiguration.aaiHostPortNumber":3334,
                                               "aai.aaiClientConfiguration.aaiProtocol":"https",
@@ -123,11 +130,13 @@ services:
 
                                               "streams_publishes":{
                                                 "pnf-update":{
+                                                  "type": "message_router",
                                                   "dmaap_info":{
                                                     "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE"
                                                   }
                                                 },
                                                 "pnf-ready":{
+                                                  "type": "message_router",
                                                   "dmaap_info":{
                                                     "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY"
                                                   }
@@ -135,6 +144,7 @@ services:
                                               },
                                               "streams_subscribes":{
                                                 "ves-reg-output":{
+                                                  "type": "message_router",
                                                   "dmaap_info":{
                                                     "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT"
                                                   }
@@ -142,6 +152,7 @@ services:
                                               }
                                             }'
     ]
+    container_name: consul-cfg
     depends_on:
       - consul
 
@@ -153,3 +164,12 @@ services:
       - CONSUL_HOST
     depends_on:
       - consul-cfg
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:10000/service_component_all/dcae-prh"]
+      interval: 3s
+      timeout: 2s
+      retries: 20
+    container_name: cbs
+
+
+