diff options
| author |   dfarrelly <david.farrelly@est.tech> | 2019-04-08 10:24:10 +0000 |
|---|---|---|
| committer | dfarrelly <david.farrelly@est.tech> | 2019-04-08 10:24:10 +0000 |
| commit | dc280ce19354f127d4f1ffd1ff83f6642a7eeb6a (patch) | |
| tree | 85813851570d545c0ce440220b8a8a9806e6cdc6 /src/test/resources | |
| parent | 49d2deae8aa7b57ecf6fb692803594c1bae8e8bf (diff) | |
Remove subscription through Bus Controller
*Remove DR subscription through Bus Controller
*Add remaining data consumed indicators
*Blueprint and Config updates to remove subscription
Issue-ID: DCAEGEN2-1038
Change-Id: I8cee463a27156fa656b0e66ef3ee231daeeda8bc
Signed-off-by: dfarrelly <david.farrelly@est.tech>
Diffstat (limited to 'src/test/resources')
5 files changed, 13 insertions, 25 deletions
diff --git a/src/test/resources/datarouter_subscriber_test/valid_bc_response.json b/src/test/resources/datarouter_subscriber_test/valid_bc_response.json deleted file mode 100644 index 201b786..0000000 --- a/src/test/resources/datarouter_subscriber_test/valid_bc_response.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "dr_Sub", - "lastMod": "2019-03-11T14:29:39.659", - "status": "VALID", - "dcaeLocationName": "location", - "deliveryURL": "delivery_url", - "feedId": "2", - "logURL": "https://dmaap-dr-prov/sublog/2", - "owner": "DGL", - "subId": "1", - "suspended": false, - "use100": false, - "username": "username", - "userpwd": "password" -}
\ No newline at end of file diff --git a/src/test/resources/multiple_filter_mapper_config.json b/src/test/resources/multiple_filter_mapper_config.json index 89bca57..251beb2 100644 --- a/src/test/resources/multiple_filter_mapper_config.json +++ b/src/test/resources/multiple_filter_mapper_config.json @@ -27,8 +27,11 @@ "aaf_username": null } }, - "dmaap_dr_feed_id": "2", - "buscontroller_feed_subscription_endpoint": "http://dmaap-bc.onap.svc.cluster.local:8080/webapi/dr_subs", "dmaap_dr_delete_endpoint": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete", - "services_calls": {} + "services_calls": {}, + "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_pass_path": "src/test/resources/password", + "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_pass_path": "src/test/resources/password", + "enable_http": false }
\ No newline at end of file diff --git a/src/test/resources/no_filter_mapper_config.json b/src/test/resources/no_filter_mapper_config.json index 3f855cf..87fc021 100644 --- a/src/test/resources/no_filter_mapper_config.json +++ b/src/test/resources/no_filter_mapper_config.json @@ -27,8 +27,11 @@ "aaf_username": null } }, - "dmaap_dr_feed_id": "2", - "buscontroller_feed_subscription_endpoint": "http://dmaap-bc.onap.svc.cluster.local:8080/webapi/dr_subs", "dmaap_dr_delete_endpoint": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete", - "services_calls": {} + "services_calls": {}, + "key_store_path": "src/test/resources/testkeystore.jks.b64", + "key_store_pass_path": "src/test/resources/password", + "trust_store_path": "src/test/resources/testkeystore.jks.b64", + "trust_store_pass_path": "src/test/resources/password", + "enable_http": false }
\ 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 e37b77e..3d9d707 100644 --- a/src/test/resources/valid_mapper_config.json +++ b/src/test/resources/valid_mapper_config.json @@ -27,8 +27,6 @@ "aaf_username": null
}
},
- "dmaap_dr_feed_id": "2",
- "buscontroller_feed_subscription_endpoint": "http://dmaap-bc.onap.svc.cluster.local:8080/webapi/dr_subs",
"dmaap_dr_delete_endpoint": "http://dmaap-dr-node.onap.svc.cluster.local:8443/delete",
"services_calls": {},
"key_store_path": "src/test/resources/testkeystore.jks.b64",
diff --git a/src/test/resources/valid_metadata.json b/src/test/resources/valid_metadata.json index cf21437..21de3fb 100644 --- a/src/test/resources/valid_metadata.json +++ b/src/test/resources/valid_metadata.json @@ -8,6 +8,5 @@ "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", "compression": "gzip", "fileFormatType": "org.3GPP.32.435#measCollec", - "fileFormatVersion": "V9", - "decompression_status": "false" + "fileFormatVersion": "V9" }
\ No newline at end of file |