From 8b47d21863a8d9669ddb3a330c2c3d76c6b065a3 Mon Sep 17 00:00:00 2001 From: YongchaoWu Date: Mon, 18 Mar 2019 14:17:02 +0000 Subject: 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 --- .../dpo/blueprints/k8s-datafile.yaml | 35 +-- .../dpo/spec/datafile-component-spec.json | 260 --------------------- datafile-app-server/dpo/spec/dmaap.json | 2 +- datafile-app-server/dpo/tosca_models/schema.yaml | 52 ----- datafile-app-server/dpo/tosca_models/template.yaml | 26 --- .../dpo/tosca_models/translate.yaml | 104 --------- 6 files changed, 8 insertions(+), 471 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 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 @@ -52,26 +52,6 @@ "type": "string", "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", @@ -82,166 +62,6 @@ "type": "string", "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", @@ -332,86 +152,6 @@ "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": "", 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" } } } diff --git a/datafile-app-server/dpo/tosca_models/schema.yaml b/datafile-app-server/dpo/tosca_models/schema.yaml index 72c7e973..39b33879 100644 --- a/datafile-app-server/dpo/tosca_models/schema.yaml +++ b/datafile-app-server/dpo/tosca_models/schema.yaml @@ -505,60 +505,8 @@ node_types: tosca.dcae.nodes.dockerApp.dcaegen2.collectors.datafile.datafile-app-server: derived_from: tosca.dcae.nodes.dockerApp properties: - buscontroller_feed_publishing_endpoint: - 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: diff --git a/datafile-app-server/dpo/tosca_models/template.yaml b/datafile-app-server/dpo/tosca_models/template.yaml index a8621b40..e31b538b 100644 --- a/datafile-app-server/dpo/tosca_models/template.yaml +++ b/datafile-app-server/dpo/tosca_models/template.yaml @@ -15,33 +15,7 @@ topology_template: dcaegen2.collectors.datafile.datafile-app-server: type: tosca.dcae.nodes.dockerApp.dcaegen2.collectors.datafile.datafile-app-server 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 diff --git a/datafile-app-server/dpo/tosca_models/translate.yaml b/datafile-app-server/dpo/tosca_models/translate.yaml index 33d2caa5..1ec47db2 100644 --- a/datafile-app-server/dpo/tosca_models/translate.yaml +++ b/datafile-app-server/dpo/tosca_models/translate.yaml @@ -5,8 +5,6 @@ imports: - schema: schema.yaml topology_template: inputs: - buscontroller_feed_publishing_endpoint: - type: string cpu_period: type: integer default: 10000 @@ -18,56 +16,6 @@ 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: @@ -126,60 +74,8 @@ topology_template: type: dcae.nodes.DockerContainerForComponentsUsingDmaap properties: application_config: - buscontroller_feed_publishing_endpoint: - 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: -- cgit 1.2.3-korg