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=45c71dc8a4984f299adcd5f50239cddc0451ddc2;hpb=e3a3f9620fd6ae7fadb346477fdaae33735a94a6;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 45c71dc8..bf50c7ab 100644
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -1,37 +1,24 @@
-version: "3"
+version: "2.2"
 services:
   prh:
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
     ports:
       - "8100:8100"
       - "8433:8433"
-    environment:
-      - LOG_LEVEL
-      - PRH_LOG_LEVEL
-    container_name: prh
-    depends_on:
-      - cbs
-      - dmaap-mr
-      - aai
-
-  ssl_prh:
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
-    ports:
-      - "8200:8100"
-      - "8533:8433"
     volumes:
       - ./simulator/certs:/tmp/certs
+      - ./prh_configs/prh_config_volume:/app-config
     environment:
-      - LOG_LEVEL
-      - PRH_LOG_LEVEL
-      - HOSTNAME
-      - CONSUL_HOST
+      - HOSTNAME=dcae-prh
+      - CONSUL_HOST                # not in use, but still required by SDK - should be removed later on
       - CONFIG_BINDING_SERVICE
-    container_name: ssl_prh
+      - CONFIG_BINDING_SERVICE_SERVICE_PORT
+    container_name: prh
     depends_on:
-      - cbs
-      - dmaap-mr
-      - aai
+      dmaap-mr:
+        condition: service_started
+      aai:
+        condition: service_started
 
   dmaap-mr:
     build:
@@ -52,107 +39,3 @@ services:
       - "3334:3334"
       - "3335:3335"
     container_name: aai_simulator
-
-  consul:
-    image: consul:1.0.6
-    ports:
-      - "8500:8500"
-    command: ["agent", "-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
-    volumes:
-      - ./consul.d/:/consul/consul.d
-
-  consul-cfg:
-    image: consul:1.0.6
-    restart: on-failure
-    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.dmaapTopicName": "events/unauthenticated.VES_PNFREG_OUTPUT",
-                                              "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http",
-                                              "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin",
-                                              "dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin",
-                                              "dmaap.dmaapConsumerConfiguration.dmaapContentType": "application/json",
-                                              "dmaap.dmaapConsumerConfiguration.consumerId": "c12",
-                                              "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDCAE-c12",
-                                              "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-                                              "dmaap.dmaapConsumerConfiguration.messageLimit": -1,
-
-                                              "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY",
-                                              "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr",
-                                              "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223,
-                                              "dmaap.dmaapProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_READY",
-                                              "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http",
-                                              "dmaap.dmaapProducerConfiguration.dmaapUserName":"admin",
-                                              "dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin",
-                                              "dmaap.dmaapProducerConfiguration.dmaapContentType": "application/json",
-
-                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE",
-                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-mr",
-                                              "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223,
-                                              "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.aaiHost":"aai",
-                                              "aai.aaiClientConfiguration.aaiHostPortNumber":3334,
-                                              "aai.aaiClientConfiguration.aaiProtocol":"https",
-                                              "aai.aaiClientConfiguration.aaiUserName": "DCAE",
-                                              "aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
-                                              "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,
-                                              "aai.aaiClientConfiguration.aaiBasePath": "/aai/v12",
-                                              "aai.aaiClientConfiguration.aaiPnfPath": "/network/pnfs/pnf",
-                                              "aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
-                                              "aai.aaiClientConfiguration.aaiHeaders":{
-                                                        "X-FromAppId": "prh",
-                                                        "X-TransactionId": "9999",
-                                                        "Accept": "application/json",
-                                                        "Real-Time": "true",
-                                                        "Authorization": "Basic QUFJOkFBSQ=="
-                                              },
-
-                                              "security.trustStorePath":"change it",
-                                              "security.trustStorePasswordPath":"change it",
-                                              "security.keyStorePath":"change it",
-                                              "security.keyStorePasswordPath":"change it",
-                                              "security.enableAaiCertAuth":false,
-                                              "security.enableDmaapCertAuth":false,
-
-                                              "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"
-                                                  }
-                                                }
-                                              },
-                                              "streams_subscribes":{
-                                                "ves-reg-output":{
-                                                  "type": "message_router",
-                                                  "dmaap_info":{
-                                                    "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT"
-                                                  }
-                                                }
-                                              }
-                                            }'
-    ]
-    depends_on:
-      - consul
-
-  cbs:
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
-    ports:
-      - "10000:10000"
-    environment:
-      - CONSUL_HOST
-    depends_on:
-      - consul-cfg