Merge "Use single PRH container with ssl configuration Generating new certificates...

[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 992534f..a8e5d56 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -5,23 +5,6 @@ services:
     ports:
       - "8100:8100"
       - "8433:8433"
-    environment:
-      - LOG_LEVEL
-      - PRH_LOG_LEVEL
-    container_name: prh
-    depends_on:
-      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
-    ports:
-      - "8200:8100"
-      - "8533:8433"
     volumes:
       - ./simulator/certs:/tmp/certs
     environment:
@@ -30,7 +13,7 @@ services:
       - HOSTNAME
       - CONSUL_HOST
       - CONFIG_BINDING_SERVICE
-    container_name: ssl_prh
+    container_name: prh
     depends_on:
       cbs:
         condition: service_healthy
@@ -121,11 +104,11 @@ services:
                                                         "Authorization": "Basic QUFJOkFBSQ=="
                                               },
 
-                                              "security.trustStorePath":"change it",
-                                              "security.trustStorePasswordPath":"change it",
-                                              "security.keyStorePath":"change it",
-                                              "security.keyStorePasswordPath":"change it",
-                                              "security.enableAaiCertAuth":false,
+                                              "security.trustStorePath":"/tmp/certs/truststore.jks",
+                                              "security.trustStorePasswordPath":"/tmp/certs/truststore.password",
+                                              "security.keyStorePath":"/tmp/certs/keystore.p12",
+                                              "security.keyStorePasswordPath":"/tmp/certs/keystore.password",
+                                              "security.enableAaiCertAuth":true,
                                               "security.enableDmaapCertAuth":false,
 
                                               "streams_publishes":{
@@ -156,6 +139,76 @@ services:
     depends_on:
       - consul
 
+  consul-cfg-dcae-ves-collector:
+    image: consul:1.0.6
+    restart: on-failure
+    command: ["kv", "put", "-http-addr=http://consul:8500", "dcae-ves-collector",'{
+                                            "collector.dynamic.config.update.frequency": "5",
+                                            "event.transform.flag": "0",
+                                            "collector.schema.checkflag": "1",
+                                            "collector.dmaap.streamid": "fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration",
+                                            "collector.service.port": "8080",
+                                            "collector.schema.file":"{
+                                              \"v1\":\"./etc/CommonEventFormat_27.2.json\",
+                                              \"v2\":\"./etc/CommonEventFormat_27.2.json\",
+                                              \"v3\":\"./etc/CommonEventFormat_27.2.json\",
+                                              \"v4\":\"./etc/CommonEventFormat_27.2.json\",
+                                              \"v5\":\"./etc/CommonEventFormat_28.4.1.json\",
+                                              \"v7\":\"./etc/CommonEventFormat_30.0.1.json\"
+                                            }",
+                                            "collector.keystore.passwordfile": "/opt/app/VESCollector/etc/passwordfile",
+                                            "collector.inputQueue.maxPending": "8096",
+                                            "streams_publishes":{
+                                              "ves-measurement": {
+                                                "type": "message_router",
+                                                "dmaap_info": {
+                                                  "topic_url": "http://dmaap-mr:2222/events/unauthenticated.VES_MEASUREMENT_OUTPUT/"
+                                                }
+                                              },
+                                              "ves-fault": {
+                                                "type": "message_router",
+                                                "dmaap_info": {
+                                                  "topic_url": "http://dmaap-mr:2222/events/unauthenticated.SEC_FAULT_OUTPUT/"
+                                                }
+                                              },
+                                              "ves-pnfRegistration": {
+                                                "type": "message_router",
+                                                "dmaap_info": {
+                                                  "topic_url": "http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT/"
+                                                }
+                                              },
+                                              "ves-other": {
+                                                "type": "message_router",
+                                                "dmaap_info": {
+                                                  "topic_url": "http://dmaap-mr:2222/events/unauthenticated.SEC_OTHER_OUTPUT/"
+                                                }
+                                              },
+                                              "ves-heartbeat": {
+                                                "type": "message_router",
+                                                "dmaap_info": {
+                                                  "topic_url": "http://dmaap-mr:2222/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/"
+                                                }
+                                              },
+                                              "ves-notification": {
+                                                "type": "message_router",
+                                                "dmaap_info": {
+                                                  "topic_url": "http://dmaap-mr:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/"
+                                                  }
+                                              }
+                                            },
+                                            "collector.service.secure.port": "8443",
+                                            "header.authflag": "0",
+                                            "collector.keystore.file.location": "/opt/app/VESCollector/etc/keystore",
+                                            "collector.keystore.alias":
+                                            "dynamically generated",
+                                            "services_calls": [],
+                                            "header.authlist": "sample1,c2FtcGxlMQ=="
+                                            }']
+    container_name: consul-cfg-dcae-ves-collector
+    depends_on:
+      - consul
+
+
   cbs:
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
     ports:
@@ -170,6 +223,3 @@ services:
       timeout: 2s
       retries: 20
     container_name: cbs
-
-
-