Fix DataFile - Align Dmaap Topic configuration

Remove additional configuration in Blueprints
Remove additional configruation in component
specs

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

1 files changed, 7 insertions, 28 deletions

diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
index 075cf5e7..015d1805 100644
--- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
+++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
@@ -98,32 +98,6 @@ node_templates:
               - concat: ["8433:", { get_input: host_port_secure}]
     properties:
       application_config:
-        dmmap.dmaapConsumerConfiguration.dmaapHostName: {get_input: dmaap_mr_host}
-        dmmap.dmaapConsumerConfiguration.dmaapPortNumber: {get_input: dmaap_mr_port}
-        dmmap.dmaapConsumerConfiguration.dmaapTopicName: "/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-        dmmap.dmaapConsumerConfiguration.dmaapProtocol: "http"
-        dmmap.dmaapConsumerConfiguration.dmaapUserName: {get_input: dmaap_mr_user}
-        dmmap.dmaapConsumerConfiguration.dmaapUserPassword: {get_input: dmaap_mr_passwd }
-        dmmap.dmaapConsumerConfiguration.dmaapContentType: "application/json"
-        dmmap.dmaapConsumerConfiguration.consumerId: "C12"
-        dmmap.dmaapConsumerConfiguration.consumerGroup: "OpenDCAE-c12"
-        dmmap.dmaapConsumerConfiguration.timeoutMs: "-1"
-        dmmap.dmaapConsumerConfiguration.messageLimit: "1"
-        dmmap.dmaapProducerConfiguration.dmaapHostName: {get_input: dmaap_dr_host}
-        dmmap.dmaapProducerConfiguration.dmaapPortNumber: {get_input: dmaap_dr_port}
-        dmmap.dmaapProducerConfiguration.dmaapTopicName: "publish"
-        dmmap.dmaapProducerConfiguration.dmaapProtocol: "https"
-        dmmap.dmaapProducerConfiguration.dmaapUserName: {get_input: dmaap_dr_user}
-        dmmap.dmaapProducerConfiguration.dmaapUserPassword: {get_input: dmaap_dr_passwd}
-        dmmap.dmaapProducerConfiguration.dmaapContentType: "application/octet-stream"
-        dmaap.dmaapBusControllerConfiguration.dmaapHostName: {get_input: dmaap_buscontroller_service_host}
-        dmaap.dmaapBusControllerConfiguration.dmaapPortNumber: {get_input: dmaap_buscontroller_service_port}
-        dmaap.dmaapBusControllerConfiguration.dmaapTopicName: "webapi/feeds"
-        dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName: {get_input: dmaap_dr_feed_id}
-        dmaap.dmaapBusControllerConfiguration.dmaapProtocol: "https"
-        dmaap.dmaapBusControllerConfiguration.dmaapUserName: "dradmin"
-        dmaap.dmaapBusControllerConfiguration.dmaapUserPassword: "dradmin"
-        dmaap.dmaapBusControllerConfiguration.dmaapContentType: "application/json"
         dmaap.ftp.ftpesConfiguration.keyCert: "/config/ftpKey.jks"
         dmaap.ftp.ftpesConfiguration.keyPassword: "secret"
         dmaap.ftp.ftpesConfiguration.trustedCA: "/config/cacerts"
@@ -139,14 +113,19 @@ node_templates:
               "message_router"
             dmmap_info:
               topic_url:
-                "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
+                "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/"
         streams_publishes:
           dmaap_publisher:
             type:
               "data_router"
             dmaap_info:
+              username:
+                get_input: dmaap_dr_host
+              password:
+                get_input: dmaap_dr_passwd
               publish_url:
-                ""
+                { concat: ["http://", { get_input: dmaap_dr_user }, ".onap.svc.cluster.local",
+                           ":",{get_input: dmaap_dr_port},"/publish"]}
       docker_config:
         healthcheck:
           endpoint: /heartbeat