From 84e13d376c82b96f5dad949b3155478f8a421545 Mon Sep 17 00:00:00 2001 From: YongchaoWu Date: Thu, 14 Mar 2019 15:14:55 +0000 Subject: 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 --- datafile-app-server/dpo/tosca_models/schema.yaml | 66 +++++++++++ datafile-app-server/dpo/tosca_models/template.yaml | 33 ++++++ .../dpo/tosca_models/translate.yaml | 132 +++++++++++++++++++++ 3 files changed, 231 insertions(+) (limited to 'datafile-app-server/dpo/tosca_models') 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: {} -- cgit 1.2.3-korg