From 8cae76ef66f1928b3d5afb9a67bb330c5cd513c4 Mon Sep 17 00:00:00 2001 From: YongchaoWu Date: Tue, 4 Jun 2019 08:34:39 +0000 Subject: Blueprint alignment Blueprint is aligned with the dmaap topic configuration Change-Id: I4303724eed21047b87a8b7438970625b08811d22 Issue-ID: DCAEGEN2-1145 Signed-off-by: YongchaoWu --- datafile-app-server/dpo/tosca_models/template.yaml | 29 ++-------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'datafile-app-server/dpo/tosca_models/template.yaml') diff --git a/datafile-app-server/dpo/tosca_models/template.yaml b/datafile-app-server/dpo/tosca_models/template.yaml index 9b18414a..e1813003 100644 --- a/datafile-app-server/dpo/tosca_models/template.yaml +++ b/datafile-app-server/dpo/tosca_models/template.yaml @@ -16,6 +16,7 @@ topology_template: type: tosca.dcae.nodes.dockerApp.dcaegen2.collectors.datafile.datafile-app-server properties: datafile.policy: '' + dmaap.dmaapProducerConfiguration: '[{''changeIdentifier'': ''PM_MEAS_FILES'', ''feedName'': ''bulk_pm_feed''}]' ftp.ftpesConfiguration.keyCert: config/dfc.jks ftp.ftpesConfiguration.keyPassword: secret ftp.ftpesConfiguration.trustedCa: config/ftp.jks @@ -31,36 +32,10 @@ topology_template: security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks service_name: datafile - streams_consumer.datafile_consume_mr.message_router_topic: /events/unauthenticated.VES_NOTIFICATION_OUTPUT + streams_subscribes: '{''dmaap_subscriber'': {''dmmap_info'': {''topic_url'': ''http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12''}}}' requirements: - stream_subscribe_0: topic0 - - stream_publish_0: feed1 - policy: policy_0 - feed1: - type: tosca.dcae.nodes.dmaap.feed - properties: - feed_name: '' - location: - get_property: - - SELF - - composition - - location_id - node_name: __GET_NODE_NAME__ - capabilities: - feed: - properties: - feed_name: - get_property: - - SELF - - feed_name - location: - get_property: - - SELF - - location - node_name: - get_property: - - SELF - - node_name policy_0: type: tosca.dcae.nodes.policy properties: -- cgit 1.2.3-korg