Blueprint alignment

Blueprint is aligned with the dmaap topic configuration

Change-Id: I4303724eed21047b87a8b7438970625b08811d22
Issue-ID: DCAEGEN2-1145
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>

3 files changed, 12 insertions, 63 deletions

diff --git a/datafile-app-server/dpo/tosca_models/schema.yaml b/datafile-app-server/dpo/tosca_models/schema.yaml
index a553041d..588e5824 100644
--- a/datafile-app-server/dpo/tosca_models/schema.yaml
+++ b/datafile-app-server/dpo/tosca_models/schema.yaml
@@ -177,9 +177,6 @@ node_types:
     - stream_subscribe_0:
         capability: dcae.capabilities.dmmap.topic
         relationship: dcae.relationships.subscribe_to_events
-    - stream_publish_0:
-        capability: dcae.capabilities.dmmap.feed
-        relationship: dcae.relationships.publish_files
     - policy:
         capability: dcae.capabilities.policy
         relationship: cloudify.relationships.depends_on
@@ -507,6 +504,8 @@ node_types:
     properties:
       datafile.policy:
         type: string
+      dmaap.dmaapProducerConfiguration:
+        type: string
       ftp.ftpesConfiguration.keyCert:
         type: string
       ftp.ftpesConfiguration.keyPassword:
@@ -527,15 +526,12 @@ node_types:
         type: string
       service_name:
         type: string
-      streams_consumer.datafile_consume_mr.message_router_topic:
+      streams_subscribes:
         type: string
     requirements:
     - stream_subscribe_0:
         capability: dcae.capabilities.dmmap.topic
         relationship: dcae.relationships.subscribe_to_events
-    - stream_publish_0:
-        capability: dcae.capabilities.dmmap.feed
-        relationship: dcae.relationships.publish_files
     - policy:
         capability: dcae.capabilities.policy
         relationship: cloudify.relationships.depends_on
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:
diff --git a/datafile-app-server/dpo/tosca_models/translate.yaml b/datafile-app-server/dpo/tosca_models/translate.yaml
index e7f44133..17c36aea 100644
--- a/datafile-app-server/dpo/tosca_models/translate.yaml
+++ b/datafile-app-server/dpo/tosca_models/translate.yaml
@@ -16,6 +16,8 @@ topology_template:
       default: 256
     datafile.policy:
       type: string
+    dmaap.dmaapProducerConfiguration:
+      type: string
     ftp.ftpesConfiguration.keyCert:
       type: string
     ftp.ftpesConfiguration.keyPassword:
@@ -51,7 +53,7 @@ topology_template:
       type: string
     service_name:
       type: string
-    streams_consumer.datafile_consume_mr.message_router_topic:
+    streams_subscribes:
       type: string
   substitution_mappings:
     node_type: tosca.dcae.nodes.dockerApp.dcaegen2.collectors.datafile.datafile-app-server
@@ -63,9 +65,6 @@ topology_template:
       policy:
       - dcaegen2.collectors.datafile.datafile-app-server
       - policy
-      stream_publish_0:
-      - dcaegen2.collectors.datafile.datafile-app-server
-      - stream_publish_0
       stream_subscribe_0:
       - dcaegen2.collectors.datafile.datafile-app-server
       - stream_subscribe_0
@@ -76,6 +75,8 @@ topology_template:
         application_config:
           datafile.policy:
             get_input: datafile.policy
+          dmaap.dmaapProducerConfiguration:
+            get_input: dmaap.dmaapProducerConfiguration
           ftp.ftpesConfiguration.keyCert:
             get_input: ftp.ftpesConfiguration.keyCert
           ftp.ftpesConfiguration.keyPassword:
@@ -97,19 +98,7 @@ topology_template:
           service_name:
             get_input: service_name
           services_calls: {}
-          streams_consumer.datafile_consume_mr.message_router_topic:
-            get_input: streams_consumer.datafile_consume_mr.message_router_topic
-          streams_publishes:
-            datafile_publish_dr:
-              dmaap_info:
-                concat:
-                - '<<'
-                - get_property:
-                  - SELF
-                  - stream_publish_0
-                  - node_name
-                - '>>'
-              type: data_router
+          streams_publishes: {}
           streams_subscribes:
             datafile_subscribe_mr:
               aaf_password:
@@ -141,18 +130,7 @@ topology_template:
         location_id:
           get_input: location_id
         service_component_type: dcaegen2.collectors.datafile.datafile-app-server
-        streams_publishes:
-        - location:
-            get_property:
-            - SELF
-            - stream_publish_0
-            - location
-          name:
-            get_property:
-            - SELF
-            - stream_publish_0
-            - node_name
-          type: data_router
+        streams_publishes: []
         streams_subscribes:
         - client_role:
             get_property: