diff options
author | 2019-06-04 13:04:22 +0100 | |
---|---|---|
committer | 2019-06-04 13:04:22 +0100 | |
commit | 0cddbac307d87f12344b3f33bbff2ae2aef7181e (patch) | |
tree | 17755ea3930e3c056c1238e6e85a74f87da97287 /plans/usecases/5G-bulkpm | |
parent | bf884ba4194e101f40ca5411d91ab0fd817eac9e (diff) |
Updates for new DFC endpoints.json and DR latest
Change-Id: I2c2715bedc5c353bf68d0ce3b60878c64ce4ff22
Issue-ID: INT-832
Signed-off-by: LiamBurke <liam.burke@ericsson.com>
Diffstat (limited to 'plans/usecases/5G-bulkpm')
-rw-r--r-- | plans/usecases/5G-bulkpm/assets/datafile_endpoints.json | 71 | ||||
-rw-r--r-- | plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml | 8 |
2 files changed, 34 insertions, 45 deletions
diff --git a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json index d07e3d82..4d9c1974 100644 --- a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json +++ b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json @@ -1,43 +1,32 @@ { - "configs": { - "dmaap": { - "dmaapConsumerConfiguration": { - "dmaapHostName": "dmaapmrhost", - "dmaapPortNumber": 3904, - "dmaapTopicName": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT", - "dmaapProtocol": "http", - "dmaapUserName": "", - "dmaapUserPassword": "", - "dmaapContentType": "application/json", - "consumerId": "C12", - "consumerGroup": "OpenDcae-c12", - "timeoutMs": -1, - "messageLimit": 1 - }, - "dmaapProducerConfiguration": { - "dmaapHostName": "dmaapdrhost", - "dmaapPortNumber": 8443, - "dmaapTopicName": "publish", - "dmaapProtocol": "https", - "dmaapUserName": "dradmin", - "dmaapUserPassword": "dradmin", - "dmaapContentType": "application/octet-stream" - } - }, - "ftp": { - "ftpesConfiguration": { - "keyCert": "/config/dfc.jks", - "keyPassword": "secret", - "trustedCa": "/config/ftp.jks", - "trustedCaPassword": "secret" - } - }, - "security": { - "trustStorePath" : "trustStorePath", - "trustStorePasswordPath" : "trustStorePasswordPath", - "keyStorePath" : "keyStorePath", - "keyStorePasswordPath" : "keyStorePasswordPath", - "enableDmaapCertAuth" : "enableDmaapCertAuth" - } + "//description":"This file is only used for testing purposes", + "dmaap.ftpesConfig.keyCert":"/config/dfc.jks", + "dmaap.ftpesConfig.keyPassword":"secret", + "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", + "dmaap.ftpesConfig.trustedCaPassword":"secret", + "dmaap.security.trustStorePath":"change it", + "dmaap.security.trustStorePasswordPath":"trustStorePasswordPath", + "dmaap.security.keyStorePath":"keyStorePath", + "dmaap.security.keyStorePasswordPath":"change it", + "dmaap.security.enableDmaapCertAuth":"false", + "dmaap.dmaapProducerConfiguration" : { + "changeIdentifier":"PM_MEAS_FILES", + "feedName":"feed00" + }, + "streams_subscribes":{ + "dmaap_subscriber":{ + "dmmap_info":{ + "topic_url":"http://dradmin:dradmin@dmaapmrhost:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + }, + "type":"message_router" + } + }, + "feed00":{ + "username":"dradmin", + "log_url":"https://dmaapdrhost:8443/feedlog/1", + "publish_url":"https://dmaapdrhost:8443/publish/1", + "location":"san-francisco", + "password":"dradmin", + "publisher_id":"972.360gm" } -}
\ No newline at end of file + }
\ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index 7880656b..59da2d9f 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -1,7 +1,7 @@ version: '2.1' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.0-SNAPSHOT-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:latest container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -25,7 +25,7 @@ services: - "dcae-pm-mapper:3.3.3.3" datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.0-SNAPSHOT-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:latest container_name: datarouter-node hostname: dmaap-dr-node ports: @@ -41,7 +41,7 @@ services: - "dcae-pm-mapper:3.3.3.3" datarouter-subscriber: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:2.1.0-SNAPSHOT-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:latest container_name: fileconsumer-node hostname: subscriber.com ports: @@ -76,7 +76,7 @@ services: ves: container_name: vescollector - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.4 environment: DMAAPHOST: |