diff options
| author |   Piotr Bocheński <piotr.bochenski@nokia.com> | 2019-03-12 16:49:08 +0100 |
|---|---|---|
| committer | Piotr Bocheński <piotr.bochenski@nokia.com> | 2019-03-12 18:01:44 +0100 |
| commit | 2378ea1e620f612b8827750aaedd172a69be1d31 (patch) | |
| tree | 79eb38f59f68d83678313c55bdf7a82bce3d9557 /tests/dcaegen2 | |
| parent | 9cd0cc08e23aeb69f76198066ea9e616af251d11 (diff) | |
Use CBS in PRH testsuites
Change-Id: I12c24ebd18477d0a490ed03067560d53544ad698
Issue-ID: DCAEGEN2-1319
Signed-off-by: Piotr Bocheński <piotr.bochenski@nokia.com>
Diffstat (limited to 'tests/dcaegen2')
| -rw-r--r-- | tests/dcaegen2/prh-testcases/resources/.env | 3 | ||||
| -rw-r--r-- | tests/dcaegen2/prh-testcases/resources/consul.d/cbs.json | 10 | ||||
| -rw-r--r-- | tests/dcaegen2/prh-testcases/resources/docker-compose.yml | 54 |
3 files changed, 66 insertions, 1 deletions
diff --git a/tests/dcaegen2/prh-testcases/resources/.env b/tests/dcaegen2/prh-testcases/resources/.env index 889f7d41..a558a2e8 100644 --- a/tests/dcaegen2/prh-testcases/resources/.env +++ b/tests/dcaegen2/prh-testcases/resources/.env @@ -1,2 +1,5 @@ LOG_LEVEL=INFO PRH_LOG_LEVEL=TRACE +HOSTNAME=dcae-prh +CONSUL_HOST=consul +CONFIG_BINDING_SERVICE=cbs diff --git a/tests/dcaegen2/prh-testcases/resources/consul.d/cbs.json b/tests/dcaegen2/prh-testcases/resources/consul.d/cbs.json new file mode 100644 index 00000000..9d1b34f9 --- /dev/null +++ b/tests/dcaegen2/prh-testcases/resources/consul.d/cbs.json @@ -0,0 +1,10 @@ +{ + "service": { + "name": "cbs", + "tags": [ + "cbs" + ], + "port": 10000, + "address": "cbs" + } +} diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index 92d62526..8b6ea128 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: "3" services: prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest @@ -13,8 +13,12 @@ services: ports: - "8100:8100" - "8433:8433" + environment: + - LOG_LEVEL + - PRH_LOG_LEVEL container_name: prh depends_on: + - cbs - dmaap-bc - aai @@ -41,8 +45,15 @@ services: - "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 @@ -65,3 +76,44 @@ services: - "3334:3334" - "3335:3335" 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.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" + }' + ] + 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 |