From 85d315a40fa48255e1104a0c2d6c5ad984952c9c Mon Sep 17 00:00:00 2001 From: emartin Date: Tue, 12 Feb 2019 17:12:08 +0000 Subject: Fix mapper configuration to use CBS Change-Id: I17bb9577ac2dd9267eeade948e5bf05cdadbac57 Issue-ID: DCAEGEN2-1186 Signed-off-by: emartin --- src/test/resources/incomplete_mapper_config.json | 4 ++-- src/test/resources/valid_cbs_config.json | 23 ----------------------- src/test/resources/valid_mapper_config.json | 18 ++++++++++++++++-- 3 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 src/test/resources/valid_cbs_config.json (limited to 'src/test/resources') diff --git a/src/test/resources/incomplete_mapper_config.json b/src/test/resources/incomplete_mapper_config.json index aec0aca..ed4ebd7 100644 --- a/src/test/resources/incomplete_mapper_config.json +++ b/src/test/resources/incomplete_mapper_config.json @@ -1,10 +1,10 @@ { - "_comment": "This mapper config is missing the messagerouter feed name", + "_comment": "This mapper config is missing streams_subscribes", "pm-mapper-filter": { "filters": "{[]}" }, "3GPP.schema.file": "{\"3GPP_Schema\":\"./etc/3GPP_relaxed_schema.xsd\"}", - "streams_subscribes": {}, + "streams_subscribes": null, "streams_publishes": { "pm_mapper_handle_out": { "type": "message_router", diff --git a/src/test/resources/valid_cbs_config.json b/src/test/resources/valid_cbs_config.json deleted file mode 100644 index e2fc650..0000000 --- a/src/test/resources/valid_cbs_config.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "ID": "6e331b82-6563-3bf7-4acc-d02d1e042c9b", - "Node": "dcae-bootstrap", - "Address": "10.42.249.191", - "Datacenter": "dc1", - "TaggedAddresses": { - "lan": "10.42.249.191", - "wan": "10.42.249.191" - }, - "NodeMeta": { - "consul-network-segment": "" - }, - "ServiceID": "dcae-cbs0", - "ServiceName": "pm-mapper-service-name", - "ServiceTags": [], - "ServiceAddress": "config-binding-service", - "ServicePort": 10000, - "ServiceEnableTagOverride": false, - "CreateIndex": 124, - "ModifyIndex": 124 - } -] \ No newline at end of file diff --git a/src/test/resources/valid_mapper_config.json b/src/test/resources/valid_mapper_config.json index 7106141..27765ae 100644 --- a/src/test/resources/valid_mapper_config.json +++ b/src/test/resources/valid_mapper_config.json @@ -1,7 +1,20 @@ { "pm-mapper-filter": "{ \"filters\":[]}", "3GPP.schema.file": "{\"3GPP_Schema\":\"./etc/3GPP_relaxed_schema.xsd\"}", - "streams_subscribes": {}, + "streams_subscribes": { + "dmaap_subscriber": { + "type": "data_router", + "aaf_username": null, + "aaf_password": null, + "dmaap_info": { + "location": "location", + "delivery_url": "delivery_url", + "username": "username", + "password": "password", + "subscriber_id": "subsriber_id" + } + } + }, "streams_publishes": { "pm_mapper_handle_out": { "type": "message_router", @@ -15,6 +28,7 @@ "aaf_username": null } }, - "streams_subscribes.pm_mapper_handle_out.message_router_topic": "unauthenticated.PM_VES_OUTPUT", + "buscontroller_feed_id": "2", + "buscontroller_feed_subscription_endpoint": "http://dmaap-bc.onap.svc.cluster.local:8080/webapi/dr_subs", "services_calls": {} } \ No newline at end of file -- cgit 1.2.3-korg