From 6d25937a62c6e434c04d0956df371a84440f7762 Mon Sep 17 00:00:00 2001 From: grabinsk Date: Wed, 29 May 2019 10:19:10 +0200 Subject: [PATCH] Enable ssl for dmaap client in PRH Change-Id: I74dbf32a0e06e90a5a2d222008a4379e4c5a9a54 Issue-ID: INT-1076 Signed-off-by: grabinsk --- .../prh-testcases/resources/docker-compose.yml | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index a8e5d566..6459ad27 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -55,11 +55,11 @@ services: 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.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.VES_PNFREG_OUTPUT", "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-mr", - "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2222, + "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223, "dmaap.dmaapConsumerConfiguration.dmaapTopicName": "events/unauthenticated.VES_PNFREG_OUTPUT", - "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http", + "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"https", "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin", "dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin", "dmaap.dmaapConsumerConfiguration.dmaapContentType": "application/json", @@ -68,20 +68,20 @@ services: "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "dmaap.dmaapConsumerConfiguration.messageLimit": -1, - "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY", + "dmaap.dmaapProducerConfiguration.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.PNF_READY", "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr", - "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2222, + "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223, "dmaap.dmaapProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_READY", - "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http", + "dmaap.dmaapProducerConfiguration.dmaapProtocol":"https", "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.dmaapUrl":"https://dmaap-mr:2223/events/unauthenticated.PNF_UPDATE", "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-mr", - "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2222, + "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223, "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_UPDATE", - "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "http", + "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "https", "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin", "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin", "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json", @@ -109,19 +109,19 @@ services: "security.keyStorePath":"/tmp/certs/keystore.p12", "security.keyStorePasswordPath":"/tmp/certs/keystore.password", "security.enableAaiCertAuth":true, - "security.enableDmaapCertAuth":false, + "security.enableDmaapCertAuth":true, "streams_publishes":{ "pnf-update":{ "type": "message_router", "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE" + "topic_url":"https://dmaap-mr:2223/events/unauthenticated.PNF_UPDATE" } }, "pnf-ready":{ "type": "message_router", "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY" + "topic_url":"https://dmaap-mr:2223/events/unauthenticated.PNF_READY" } } }, @@ -129,7 +129,7 @@ services: "ves-reg-output":{ "type": "message_router", "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT" + "topic_url":"https://dmaap-mr:2223/events/unauthenticated.VES_PNFREG_OUTPUT" } } } -- 2.16.6