ARM Consul according to blueprint

[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 6d64680..e0a3ab7 100644 (file)
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -1,54 +1,63 @@
-version: '3'
+version: "3"
 services:
   prh:
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
     command: >
-        --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap
+        --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc
         --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222
-        --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap
+        --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"
+    environment:
+      - LOG_LEVEL
+      - PRH_LOG_LEVEL
     container_name: prh
     depends_on:
-     - dmaap
-     - aai
+      - cbs
+      - dmaap-bc
+      - aai
 
   ssl_prh:
-      image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
-      command: >
-          --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
-        - -Dlogging.level.org.onap.dcaegen2.services.prh=TRACE
-        - -jar
-        - /opt/prh-app-server.jar
-      ports:
-        - "8200:8100"
-        - "8533:8433"
-      container_name: ssl_prh
-      depends_on:
-       - dmaap
-       - aai
+    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
+    ports:
+      - "8200:8100"
+      - "8533:8433"
+    volumes:
+      - ./simulator/certs:/tmp/certs
+    environment:
+      - LOG_LEVEL
+      - PRH_LOG_LEVEL
+      - HOSTNAME
+      - CONSUL_HOST
+      - CONFIG_BINDING_SERVICE
+    container_name: ssl_prh
+    depends_on:
+      - cbs
+      - dmaap-bc
+      - aai
 
-  dmaap:
+  dmaap-bc:
     build:
       context: simulator
       dockerfile: DMaaP_simulator
@@ -59,11 +68,74 @@ 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
+
+  consul:
+    image: docker.io/consul:1.0.6
+    ports:
+      - "8500:8500"
+    command: ["agent", "-bootstrap", "-client=0.0.0.0", "-server", "-config-dir=/consul/consul.d"]
+    volumes:
+      - ./consul.d/:/consul/consul.d
+
+  consul-cfg:
+    image: docker.io/consul:1.0.6
+    restart: on-failure
+    command: ["kv", "put", "-http-addr=http://consul-server:8500", "dcae-prh", '{
+                                              "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-bc",
+                                              "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.dmaapHostName":"dmaap-bc",
+                                              "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.dmaapHostName": "dmaap-bc",
+                                              "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.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}"
+                                            }'
+    ]
+    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