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>

2 files changed, 1 insertions, 261 deletions

diff --git a/datafile-app-server/dpo/spec/datafile-component-spec.json b/datafile-app-server/dpo/spec/datafile-component-spec.json
index d93bdb6d..d674e73d 100644
--- a/datafile-app-server/dpo/spec/datafile-component-spec.json
+++ b/datafile-app-server/dpo/spec/datafile-component-spec.json
@@ -53,26 +53,6 @@
       "required": true
     },
     {
-      "name": "buscontroller_feed_publishing_endpoint",
-      "value": "http://dmaap-bc.onap.svc.cluster.local:8080/webapi/feeds",
-      "description": "DMAAP Bus Controller feed endpoint",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": true,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap_dr_feed_id",
-      "value": "bulk_pm_feed",
-      "description": "ID of the data router feed that the datafile collector will publish",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
       "name": "streams_consumer.datafile_consume_mr.message_router_topic",
       "value": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT",
       "description": "datafile collector consume VES event to message router topic ",
@@ -83,166 +63,6 @@
       "required": true
     },
     {
-      "name": "dmaap.dmaapConsumerConfiguration.dmaapHostName",
-      "value": "localhost",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.dmaapPortNumber",
-      "value": "2222",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.dmaapTopicName",
-      "value": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.dmaapProtocol",
-      "value": "http",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.dmaapContentType",
-      "value": "application/json",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.consumerId",
-      "value": "C12",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.consumerGroup",
-      "value": "OpenDcae-c12",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.timeoutMs",
-      "value": "-1",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapConsumerConfiguration.messageLimit",
-      "value": "1",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapProducerConfiguration.dmaapHostName",
-      "value": "localhost",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapProducerConfiguration.dmaapPortNumber",
-      "value": "3907",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapProducerConfiguration.dmaapTopicName",
-      "value": "publish",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapProducerConfiguration.dmaapProtocol",
-      "value": "https",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapProducerConfiguration.dmaapUserName",
-      "value": "dradmin",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapProducerConfiguration.dmaapUserPassword",
-      "value": "dradmin",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapProducerConfiguration.dmaapContentType",
-      "value": "application/octet-stream",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
       "name": "ftp.ftpesConfiguration.keyCert",
       "value": "config/dfc.jks",
       "description": "",
@@ -333,86 +153,6 @@
       "required": true
     },
     {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapHostName",
-      "value": "localhost",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapPortNumber",
-      "value": "6666",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapTopicName",
-      "value": "webapis/feeds",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName",
-      "value": "bulk_pm_feed",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapProtocol",
-      "value": "https",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapUserName",
-      "value": "dbcadmin",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapUserPassword",
-      "value": "dbcadmin",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
-      "name": "dmaap.dmaapBusControllerConfiguration.dmaapContentType",
-      "value": "application/json",
-      "description": "",
-      "designer_editable": true,
-      "sourced_at_deployment": false,
-      "policy_editable": false,
-      "type": "string",
-      "required": true
-    },
-    {
       "name": "datafile.policy",
       "value": "",
       "description": "datafile Policy JSON as string",
diff --git a/datafile-app-server/dpo/spec/dmaap.json b/datafile-app-server/dpo/spec/dmaap.json
index 64ceb880..c0658993 100644
--- a/datafile-app-server/dpo/spec/dmaap.json
+++ b/datafile-app-server/dpo/spec/dmaap.json
@@ -8,7 +8,7 @@
   "datafile_publish_dr": {
     "type": "data_router",
     "dmaap_info": {
-      "publish_url": ""
+      "publish_url": "/publish"
     }
   }
 }