From 4882c747fbdc76b002ea37828f87e14fd245ee46 Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Tue, 9 Apr 2019 10:49:37 +0200 Subject: Add consul streams subscribe/publishes ranaming dmaap-bc to dmaap-mr Change-Id: I784247e4830e37c4a3dd7645e244716c868074b7 Issue-ID: INT-989 Signed-off-by: Marcin Migdal --- .../prh-testcases/resources/docker-compose.yml | 42 ++++++++++++++++------ .../prh-testcases/resources/prh_library.robot | 2 +- 2 files changed, 32 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index 7f531568..426e5cba 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -3,9 +3,9 @@ services: prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest command: > - --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc + --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-mr --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222 - --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc + --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-mr --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222 --aai.aaiClientConfiguration.aaiHostPortNumber=3333 --aai.aaiClientConfiguration.aaiHost=aai @@ -19,16 +19,16 @@ services: container_name: prh depends_on: - cbs - - dmaap-bc + - dmaap-mr - aai ssl_prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest command: > - --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc + --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-mr --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2223 --dmaap.dmaapConsumerConfiguration.dmaapProtocol=https - --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc + --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-mr --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2223 --dmaap.dmaapProducerConfiguration.dmaapProtocol=https --aai.aaiClientConfiguration.aaiHostPortNumber=3334 @@ -54,10 +54,10 @@ services: container_name: ssl_prh depends_on: - cbs - - dmaap-bc + - dmaap-mr - aai - dmaap-bc: + dmaap-mr: build: context: simulator dockerfile: DMaaP_simulator @@ -89,7 +89,7 @@ services: 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.dmaapHostName":"dmaap-mr", "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223, "dmaap.dmaapConsumerConfiguration.dmaapTopicName": "events/unauthenticated.VES_PNFREG_OUTPUT", "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http", @@ -101,7 +101,7 @@ services: "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "dmaap.dmaapConsumerConfiguration.messageLimit": -1, - "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-bc", + "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr", "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223, "dmaap.dmaapProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_READY", "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http", @@ -109,7 +109,7 @@ services: "dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin", "dmaap.dmaapProducerConfiguration.dmaapContentType": "application/json", - "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-bc", + "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-mr", "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223, "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_UPDATE", "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "http", @@ -132,7 +132,27 @@ services: "security.keyStorePath":"change it", "security.keyStorePasswordPath":"change it", "security.enableAaiCertAuth":false, - "security.enableDmaapCertAuth":false + "security.enableDmaapCertAuth":false, + + "streams_publishes":{ + "pnf-update":{ + "dmaap_info":{ + "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE" + } + }, + "pnf-ready":{ + "dmaap_info":{ + "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY" + } + } + }, + "streams_subscribes":{ + "ves-reg-output":{ + "dmaap_info":{ + "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT" + } + } + } }' ] depends_on: diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot index a6a01eb9..c2311852 100644 --- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot +++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot @@ -33,9 +33,9 @@ Valid event processing [Arguments] ${input_valid__ves_event_in_dmaap} [Timeout] 30s ${data}= Get Data From File ${input_valid__ves_event_in_dmaap} + Set event in DMaaP ${data} ${pnf_name}= Create PNF name ${data} Set PNF name in AAI ${pnf_name} - Set event in DMaaP ${data} ${expected_event_pnf_ready_in_dpaap}= create pnf ready_notification as pnf ready ${data} #TODO to fix after CBS merge #Wait Until Keyword Succeeds 100x 300ms Check PNF_READY notification ${expected_event_pnf_ready_in_dpaap} -- cgit 1.2.3-korg