aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Migdal <marcin.migdal@nokia.com>2019-04-08 10:15:17 +0200
committerMarcin Migdal <marcin.migdal@nokia.com>2019-04-08 10:15:17 +0200
commitf0e481ee17ecb2b93a98130e2c7f2b669a8295bc (patch)
tree209c62c2979e14537e7e880d757a376ea2ac10ab
parentd9bff4f29a1eec5984b7808b02b3185482d6d95f (diff)
ARM Consul according to blueprint
Issue-ID: INT-989 Change-Id: I3c8792b5a7b8e3017cff9375531fafcfaa7ba200 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
-rw-r--r--tests/dcaegen2/prh-testcases/resources/docker-compose.yml40
1 files changed, 31 insertions, 9 deletions
diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index 8b6ea128..bc6f2382 100644
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -91,19 +91,41 @@ services:
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.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.dmaapProtocol":"https",
- "aai.aaiClientConfiguration.aaiHostPortNumber":3334,
+ "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",
- "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"
+ "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: