DataFile - Align Dmaap Topic configuration

Blueprints alignment
Configbinding service support
Modify the policy model complaint to R4 model expected by Policy

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

6 files changed, 594 insertions, 57 deletions

diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
index 9d13f04f..075cf5e7 100644
--- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
+++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
@@ -35,11 +35,11 @@ inputs:
   dmaap_mr_user:
     type: string
     description: dmaap messagerouter user name
-    default: "admin"
+    default: ""
   dmaap_mr_passwd:
     type: string
     description: dmaap messagerouter password
-    default: "admin"
+    default: ""
   dmaap_buscontroller_service_host:
     type: string
     description: DMAAP Bus Controller host address
@@ -98,13 +98,31 @@ 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: "dbcadmin"
-        dmaap.dmaapBusControllerConfiguration.dmaapUserPassword: "dbcadmin"
+        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"
@@ -120,47 +138,15 @@ node_templates:
             type:
               "message_router"
             dmmap_info:
-              dmaapHostName:
-                get_input: dmaap_mr_host
-              dmaapPortNumber:
-                get_input: dmaap_mr_port
-              dmaapTopicName:
-                "/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-              dmaapProtocol:
-                "http"
-              dmaapUserName:
-                get_input: dmaap_mr_user
-              dmaapUserPassword:
-                get_input: dmaap_mr_passwd
-              dmaapContentType:
-                "application/json"
-              consumerId:
-                "C12"
-              consumerGroup:
-                "OpenDCAE-c12"
-              timeoutMs:
-                -1
-              messageLimit:
-                -1
+              topic_url:
+                "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
         streams_publishes:
           dmaap_publisher:
             type:
               "data_router"
             dmaap_info:
-              dmaapHostName:
-                get_input: dmaap_dr_host
-              dmaapPortNumber:
-                get_input: dmaap_dr_port
-              dmaapTopicName:
-                "publish"
-              dmaapProtocol:
-                "https"
-              dmaapUserName:
-                get_input: dmaap_dr_user
-              dmaapUserPassword:
-                get_input: dmaap_dr_passwd
-              dmaapContentType:
-                "application/octet-stream"
+              publish_url:
+                ""
       docker_config:
         healthcheck:
           endpoint: /heartbeat
diff --git a/datafile-app-server/dpo/policy.yaml b/datafile-app-server/dpo/policy.yaml
index 28f9db15..fdd5696a 100644
--- a/datafile-app-server/dpo/policy.yaml
+++ b/datafile-app-server/dpo/policy.yaml
@@ -1,21 +1,11 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
-node_types:
-  policy.nodes.Root:
-    derived_from: tosca.nodes.Root
-    properties:
-      policyDescription:
-        required: false
-        type: string
-      policyName:
-        required: true
-        type: string
-      policyScope:
-        required: true
-        type: string
-      policyVersion:
-        required: true
-        type: string
-  policy.nodes.dcaegen2.collectors.datafile.datafile-app-server:
+policy_types:
+  onap.policies.Monitoring:
+    derived_from: tosca.policies.Root
+    description: a base policy type for all policies that govern monitoring provision
+    version: 1.0.0
+  onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:
+    version: 1.0.0
     derived_from: policy.nodes.Root
     properties:
       buscontroller_feed_publishing_endpoint:
diff --git a/datafile-app-server/dpo/spec/datafile-component-spec.json b/datafile-app-server/dpo/spec/datafile-component-spec.json
index 43ac27b5..d93bdb6d 100644
--- a/datafile-app-server/dpo/spec/datafile-component-spec.json
+++ b/datafile-app-server/dpo/spec/datafile-component-spec.json
@@ -83,6 +83,336 @@
       "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": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "ftp.ftpesConfiguration.keyPassword",
+      "value": "secret",
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "ftp.ftpesConfiguration.trustedCA",
+      "value": "config/ftp.jks",
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "ftp.ftpesConfiguration.trustedCAPassword",
+      "value": "secret",
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "security.trustStorePath",
+      "value": "/opt/app/datafile/etc/cert/trust.jks",
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "security.trustStorePasswordPath",
+      "value": "/opt/app/datafile/etc/cert/trust.pass",
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "security.keyStorePath",
+      "value": "/opt/app/datafile/etc/cert/key.p12",
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "security.keyStorePasswordPath",
+      "value": "/opt/app/datafile/etc/cert/key.pass",
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "required": true
+    },
+    {
+      "name": "security.enableDmaapCertAuth",
+      "value": false,
+      "description": "",
+      "designer_editable": true,
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "type": "string",
+      "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/tosca_models/schema.yaml b/datafile-app-server/dpo/tosca_models/schema.yaml
index 4b02f8b7..72c7e973 100644
--- a/datafile-app-server/dpo/tosca_models/schema.yaml
+++ b/datafile-app-server/dpo/tosca_models/schema.yaml
@@ -509,8 +509,74 @@ node_types:
         type: string
       datafile.policy:
         type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapContentType:
+        type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName:
+        type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapHostName:
+        type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapPortNumber:
+        type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapProtocol:
+        type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapTopicName:
+        type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapUserName:
+        type: string
+      dmaap.dmaapBusControllerConfiguration.dmaapUserPassword:
+        type: string
+      dmaap.dmaapConsumerConfiguration.consumerGroup:
+        type: string
+      dmaap.dmaapConsumerConfiguration.consumerId:
+        type: string
+      dmaap.dmaapConsumerConfiguration.dmaapContentType:
+        type: string
+      dmaap.dmaapConsumerConfiguration.dmaapHostName:
+        type: string
+      dmaap.dmaapConsumerConfiguration.dmaapPortNumber:
+        type: string
+      dmaap.dmaapConsumerConfiguration.dmaapProtocol:
+        type: string
+      dmaap.dmaapConsumerConfiguration.dmaapTopicName:
+        type: string
+      dmaap.dmaapConsumerConfiguration.messageLimit:
+        type: string
+      dmaap.dmaapConsumerConfiguration.timeoutMs:
+        type: string
+      dmaap.dmaapProducerConfiguration.dmaapContentType:
+        type: string
+      dmaap.dmaapProducerConfiguration.dmaapHostName:
+        type: string
+      dmaap.dmaapProducerConfiguration.dmaapPortNumber:
+        type: string
+      dmaap.dmaapProducerConfiguration.dmaapProtocol:
+        type: string
+      dmaap.dmaapProducerConfiguration.dmaapTopicName:
+        type: string
+      dmaap.dmaapProducerConfiguration.dmaapUserName:
+        type: string
+      dmaap.dmaapProducerConfiguration.dmaapUserPassword:
+        type: string
       dmaap_dr_feed_id:
         type: string
+      ftp.ftpesConfiguration.keyCert:
+        type: string
+      ftp.ftpesConfiguration.keyPassword:
+        type: string
+      ftp.ftpesConfiguration.trustedCA:
+        type: string
+      ftp.ftpesConfiguration.trustedCAPassword:
+        type: string
+      security.enableDmaapCertAuth:
+        type: string
+      security.keyStorePasswordPath:
+        type: string
+      security.keyStorePath:
+        type: string
+      security.trustStorePasswordPath:
+        type: string
+      security.trustStorePath:
+        type: string
       service_name:
         type: string
       streams_consumer.datafile_consume_mr.message_router_topic:
diff --git a/datafile-app-server/dpo/tosca_models/template.yaml b/datafile-app-server/dpo/tosca_models/template.yaml
index 89955b2e..a8621b40 100644
--- a/datafile-app-server/dpo/tosca_models/template.yaml
+++ b/datafile-app-server/dpo/tosca_models/template.yaml
@@ -17,12 +17,45 @@ topology_template:
       properties:
         buscontroller_feed_publishing_endpoint: http://dmaap-bc.onap.svc.cluster.local:8080/webapi/feeds
         datafile.policy: ''
+        dmaap.dmaapBusControllerConfiguration.dmaapContentType: application/json
+        dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName: bulk_pm_feed
+        dmaap.dmaapBusControllerConfiguration.dmaapHostName: localhost
+        dmaap.dmaapBusControllerConfiguration.dmaapPortNumber: '6666'
+        dmaap.dmaapBusControllerConfiguration.dmaapProtocol: https
+        dmaap.dmaapBusControllerConfiguration.dmaapTopicName: webapis/feeds
+        dmaap.dmaapBusControllerConfiguration.dmaapUserName: dbcadmin
+        dmaap.dmaapBusControllerConfiguration.dmaapUserPassword: dbcadmin
+        dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+        dmaap.dmaapConsumerConfiguration.consumerId: C12
+        dmaap.dmaapConsumerConfiguration.dmaapContentType: application/json
+        dmaap.dmaapConsumerConfiguration.dmaapHostName: localhost
+        dmaap.dmaapConsumerConfiguration.dmaapPortNumber: '2222'
+        dmaap.dmaapConsumerConfiguration.dmaapProtocol: http
+        dmaap.dmaapConsumerConfiguration.dmaapTopicName: /events/unauthenticated.VES_NOTIFICATION_OUTPUT
+        dmaap.dmaapConsumerConfiguration.messageLimit: '1'
+        dmaap.dmaapConsumerConfiguration.timeoutMs: '-1'
+        dmaap.dmaapProducerConfiguration.dmaapContentType: application/octet-stream
+        dmaap.dmaapProducerConfiguration.dmaapHostName: localhost
+        dmaap.dmaapProducerConfiguration.dmaapPortNumber: '3907'
+        dmaap.dmaapProducerConfiguration.dmaapProtocol: https
+        dmaap.dmaapProducerConfiguration.dmaapTopicName: publish
+        dmaap.dmaapProducerConfiguration.dmaapUserName: dradmin
+        dmaap.dmaapProducerConfiguration.dmaapUserPassword: dradmin
         dmaap_dr_feed_id: bulk_pm_feed
+        ftp.ftpesConfiguration.keyCert: config/dfc.jks
+        ftp.ftpesConfiguration.keyPassword: secret
+        ftp.ftpesConfiguration.trustedCA: config/ftp.jks
+        ftp.ftpesConfiguration.trustedCAPassword: secret
         location_id:
           get_property:
           - SELF
           - composition
           - location_id
+        security.enableDmaapCertAuth: 'False'
+        security.keyStorePasswordPath: /opt/app/datafile/etc/cert/key.pass
+        security.keyStorePath: /opt/app/datafile/etc/cert/key.p12
+        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
       requirements:
diff --git a/datafile-app-server/dpo/tosca_models/translate.yaml b/datafile-app-server/dpo/tosca_models/translate.yaml
index ef9b40f0..33d2caa5 100644
--- a/datafile-app-server/dpo/tosca_models/translate.yaml
+++ b/datafile-app-server/dpo/tosca_models/translate.yaml
@@ -18,8 +18,64 @@ topology_template:
       default: 256
     datafile.policy:
       type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapContentType:
+      type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName:
+      type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapHostName:
+      type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapPortNumber:
+      type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapProtocol:
+      type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapTopicName:
+      type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapUserName:
+      type: string
+    dmaap.dmaapBusControllerConfiguration.dmaapUserPassword:
+      type: string
+    dmaap.dmaapConsumerConfiguration.consumerGroup:
+      type: string
+    dmaap.dmaapConsumerConfiguration.consumerId:
+      type: string
+    dmaap.dmaapConsumerConfiguration.dmaapContentType:
+      type: string
+    dmaap.dmaapConsumerConfiguration.dmaapHostName:
+      type: string
+    dmaap.dmaapConsumerConfiguration.dmaapPortNumber:
+      type: string
+    dmaap.dmaapConsumerConfiguration.dmaapProtocol:
+      type: string
+    dmaap.dmaapConsumerConfiguration.dmaapTopicName:
+      type: string
+    dmaap.dmaapConsumerConfiguration.messageLimit:
+      type: string
+    dmaap.dmaapConsumerConfiguration.timeoutMs:
+      type: string
+    dmaap.dmaapProducerConfiguration.dmaapContentType:
+      type: string
+    dmaap.dmaapProducerConfiguration.dmaapHostName:
+      type: string
+    dmaap.dmaapProducerConfiguration.dmaapPortNumber:
+      type: string
+    dmaap.dmaapProducerConfiguration.dmaapProtocol:
+      type: string
+    dmaap.dmaapProducerConfiguration.dmaapTopicName:
+      type: string
+    dmaap.dmaapProducerConfiguration.dmaapUserName:
+      type: string
+    dmaap.dmaapProducerConfiguration.dmaapUserPassword:
+      type: string
     dmaap_dr_feed_id:
       type: string
+    ftp.ftpesConfiguration.keyCert:
+      type: string
+    ftp.ftpesConfiguration.keyPassword:
+      type: string
+    ftp.ftpesConfiguration.trustedCA:
+      type: string
+    ftp.ftpesConfiguration.trustedCAPassword:
+      type: string
     image:
       type: string
     location_id:
@@ -33,6 +89,16 @@ topology_template:
     restart_policy.max_retry_counts:
       type: integer
       default: 3
+    security.enableDmaapCertAuth:
+      type: string
+    security.keyStorePasswordPath:
+      type: string
+    security.keyStorePath:
+      type: string
+    security.trustStorePasswordPath:
+      type: string
+    security.trustStorePath:
+      type: string
     service_component_type:
       type: string
     service_name:
@@ -64,8 +130,74 @@ topology_template:
             get_input: buscontroller_feed_publishing_endpoint
           datafile.policy:
             get_input: datafile.policy
+          dmaap.dmaapBusControllerConfiguration.dmaapContentType:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapContentType
+          dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapDrFeedName
+          dmaap.dmaapBusControllerConfiguration.dmaapHostName:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapHostName
+          dmaap.dmaapBusControllerConfiguration.dmaapPortNumber:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapPortNumber
+          dmaap.dmaapBusControllerConfiguration.dmaapProtocol:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapProtocol
+          dmaap.dmaapBusControllerConfiguration.dmaapTopicName:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapTopicName
+          dmaap.dmaapBusControllerConfiguration.dmaapUserName:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapUserName
+          dmaap.dmaapBusControllerConfiguration.dmaapUserPassword:
+            get_input: dmaap.dmaapBusControllerConfiguration.dmaapUserPassword
+          dmaap.dmaapConsumerConfiguration.consumerGroup:
+            get_input: dmaap.dmaapConsumerConfiguration.consumerGroup
+          dmaap.dmaapConsumerConfiguration.consumerId:
+            get_input: dmaap.dmaapConsumerConfiguration.consumerId
+          dmaap.dmaapConsumerConfiguration.dmaapContentType:
+            get_input: dmaap.dmaapConsumerConfiguration.dmaapContentType
+          dmaap.dmaapConsumerConfiguration.dmaapHostName:
+            get_input: dmaap.dmaapConsumerConfiguration.dmaapHostName
+          dmaap.dmaapConsumerConfiguration.dmaapPortNumber:
+            get_input: dmaap.dmaapConsumerConfiguration.dmaapPortNumber
+          dmaap.dmaapConsumerConfiguration.dmaapProtocol:
+            get_input: dmaap.dmaapConsumerConfiguration.dmaapProtocol
+          dmaap.dmaapConsumerConfiguration.dmaapTopicName:
+            get_input: dmaap.dmaapConsumerConfiguration.dmaapTopicName
+          dmaap.dmaapConsumerConfiguration.messageLimit:
+            get_input: dmaap.dmaapConsumerConfiguration.messageLimit
+          dmaap.dmaapConsumerConfiguration.timeoutMs:
+            get_input: dmaap.dmaapConsumerConfiguration.timeoutMs
+          dmaap.dmaapProducerConfiguration.dmaapContentType:
+            get_input: dmaap.dmaapProducerConfiguration.dmaapContentType
+          dmaap.dmaapProducerConfiguration.dmaapHostName:
+            get_input: dmaap.dmaapProducerConfiguration.dmaapHostName
+          dmaap.dmaapProducerConfiguration.dmaapPortNumber:
+            get_input: dmaap.dmaapProducerConfiguration.dmaapPortNumber
+          dmaap.dmaapProducerConfiguration.dmaapProtocol:
+            get_input: dmaap.dmaapProducerConfiguration.dmaapProtocol
+          dmaap.dmaapProducerConfiguration.dmaapTopicName:
+            get_input: dmaap.dmaapProducerConfiguration.dmaapTopicName
+          dmaap.dmaapProducerConfiguration.dmaapUserName:
+            get_input: dmaap.dmaapProducerConfiguration.dmaapUserName
+          dmaap.dmaapProducerConfiguration.dmaapUserPassword:
+            get_input: dmaap.dmaapProducerConfiguration.dmaapUserPassword
           dmaap_dr_feed_id:
             get_input: dmaap_dr_feed_id
+          ftp.ftpesConfiguration.keyCert:
+            get_input: ftp.ftpesConfiguration.keyCert
+          ftp.ftpesConfiguration.keyPassword:
+            get_input: ftp.ftpesConfiguration.keyPassword
+          ftp.ftpesConfiguration.trustedCA:
+            get_input: ftp.ftpesConfiguration.trustedCA
+          ftp.ftpesConfiguration.trustedCAPassword:
+            get_input: ftp.ftpesConfiguration.trustedCAPassword
+          security.enableDmaapCertAuth:
+            get_input: security.enableDmaapCertAuth
+          security.keyStorePasswordPath:
+            get_input: security.keyStorePasswordPath
+          security.keyStorePath:
+            get_input: security.keyStorePath
+          security.trustStorePasswordPath:
+            get_input: security.trustStorePasswordPath
+          security.trustStorePath:
+            get_input: security.trustStorePath
           service_name:
             get_input: service_name
           services_calls: {}