From ffc7dda6ca1ee529ead29db7b45266f6d6c7587f Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Mon, 3 Jun 2019 08:17:39 +0000 Subject: Update DFC blueprint * Create datarouter feed(s) using DmaaP plugin * Adjust application_config for Generalized DFC to handle any type of file (in a separate commit DCAEGEN2-1532) Change-Id: I904395bc89f12fbc8ac84902c41ed2db294b4786 Issue-ID: DCAEGEN2-1580 Signed-off-by: RehanRaza --- .../k8s-datafile-collector.yaml-template | 120 ++++++++++----------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/blueprints/reference_templates/k8s-datafile-collector.yaml-template b/blueprints/reference_templates/k8s-datafile-collector.yaml-template index 1b5222f..1a85548 100644 --- a/blueprints/reference_templates/k8s-datafile-collector.yaml-template +++ b/blueprints/reference_templates/k8s-datafile-collector.yaml-template @@ -2,7 +2,7 @@ # # ============LICENSE_START==================================================== # ============================================================================= -# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-2019 AT&T Intellectual Property, 2019 Nordix Foundation. All rights reserved. # ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,8 +20,9 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: -- "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" -- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml" + - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" + - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml" + - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml" inputs: dmaap_mr_host: @@ -32,87 +33,83 @@ inputs: type: integer description: dmaap messagerouter port default: 3904 - dmaap_mr_user: + dmaap_mr_protocol: type: string - description: dmaap messagerouter user name - default: "admin" - dmaap_mr_passwd: - type: string - description: dmaap messagerouter password - default: "admin" - dmaap_dr_host: - type: string - description: dmaap datarouter host - default: dmaap-dr-prov.onap.svc.cluster.local - dmaap_dr_port: - type: integer - description: dmaap datarouter port - default: 8443 - dmaap_dr_user: - type: string - description: dmaap datarouter user name - default: "dradmin" - dmaap_dr_passwd: - type: string - description: dmaap datarouter password - default: "dradmin" + description: dmaap messagerouter protocol + default: "http" tag_version: type: string - default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.3" + description: DFC image tag/version + default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2.0" replicas: type: integer description: number of instances default: 1 - host_port: - type: integer - description: port on Kubernetes host where datafile API will be exposed - default: 30223 - host_port_secure: - type: integer - description: secure port on Kubernetes host where datafile API will be exposed - default: 30224 secureEnableCert: type: boolean description: enable certificate base connection with PNF and DMaap default: false + feedName: + type: string + description: feed name for dmaap producerconfiguration + default: "bulk_pm_feed" + feedDescription: + type: string + default: "Feed for Bulk PM files" + changeIdentifier: + type: string + description: type of different files + default: "PM_MEAS_FILES" + node_templates: + bulk_pm_feed: + type: ccsdk.nodes.Feed + properties: + feed_name: { get_input: feedName } + feed_description: { get_input: feedDescription } + datafile-collector: + type: dcae.nodes.ContainerizedServiceComponentUsingDmaap + + relationships: + - type: ccsdk.relationships.publish_files + target: bulk_pm_feed + interfaces: cloudify.interfaces.lifecycle: start: inputs: ports: - - concat: ["8100:0"] - - concat: ["8433:0"] + - concat: ["8100:0"] + - concat: ["8433:0"] + properties: + service_component_type: 'dcae-datafile' application_config: - dmaap.dmaapConsumerConfiguration.dmaapHostName: { get_input: dmaap_mr_host } - dmaap.dmaapConsumerConfiguration.dmaapPortNumber: { get_input: dmaap_mr_port } - dmaap.dmaapConsumerConfiguration.dmaapTopicName: "/events/unauthenticated.VES_NOTIFICATION_OUTPUT" - dmaap.dmaapConsumerConfiguration.dmaapProtocol: "http" - dmaap.dmaapConsumerConfiguration.dmaapUserName: { get_input: dmaap_mr_user } - dmaap.dmaapConsumerConfiguration.dmaapUserPassword: { get_input: dmaap_mr_passwd } - dmaap.dmaapConsumerConfiguration.dmaapContentType: "application/json" - dmaap.dmaapConsumerConfiguration.consumerId: "C12" - dmaap.dmaapConsumerConfiguration.consumerGroup: "OpenDCAE-c12" - dmaap.dmaapConsumerConfiguration.timeoutMs: -1 - dmaap.dmaapConsumerConfiguration.messageLimit: -1 - dmaap.dmaapProducerConfiguration.dmaapHostName: { get_input: dmaap_dr_host } - dmaap.dmaapProducerConfiguration.dmaapPortNumber: { get_input: dmaap_dr_port } - dmaap.dmaapProducerConfiguration.dmaapTopicName: "publish" - dmaap.dmaapProducerConfiguration.dmaapProtocol: "https" - dmaap.dmaapProducerConfiguration.dmaapUserName: { get_input: dmaap_dr_user } - dmaap.dmaapProducerConfiguration.dmaapUserPassword: { get_input: dmaap_dr_passwd } - dmaap.dmaapProducerConfiguration.dmaapContentType: "application/octet-stream" - dmaap.ftp.ftpesConfiguration.keyCert: "/opt/app/datafile/config/dfc.jks" - dmaap.ftp.ftpesConfiguration.keyPassword: "secret" - dmaap.ftp.ftpesConfiguration.trustedCa: "/opt/app/datafile/config/ftp.jks" - dmaap.ftp.ftpesConfiguration.trustedCaPassword: "secret" + dmaap.ftpesConfig.keyCert: "/opt/app/datafile/config/dfc.jks" + dmaap.ftpesConfig.keyPassword: "secret" + dmaap.ftpesConfig.trustedCa: "/opt/app/datafile/config/ftp.jks" + dmaap.ftpesConfig.trustedCaPassword: "secret" dmaap.security.trustStorePath: "/opt/app/datafile/etc/cert/trust.jks" dmaap.security.trustStorePasswordPath: "/opt/app/datafile/etc/cert/trust.pass" dmaap.security.keyStorePath: "/opt/app/datafile/etc/cert/key.p12" dmaap.security.keyStorePasswordPath: "/opt/app/datafile/etc/cert/key.pass" dmaap.security.enableDmaapCertAuth: { get_input: secureEnableCert } + dmaap.dmaapProducerConfiguration: + changeIdentifier: {get_input: changeIdentifier} + feedName: {get_input: feedName} + streams_subscribes: + dmaap_subscriber: + type: + "message_router" + dmmap_info: + topic_url: + { concat: [{ get_input: dmaap_mr_protocol },"://",{ get_input: dmaap_mr_host }, + ":",{ get_input: dmaap_mr_port },"/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"]} + streams_publishes: + - name: bulk_pm_feed + type: data_router + location: "loc00" docker_config: healthcheck: endpoint: /heartbeat @@ -122,11 +119,8 @@ node_templates: image: get_input: tag_version replicas: {get_input: replicas} - name: 'dcae-datafile-collector' - dns_name: 'dcae-datafile-collector' log_info: - log_directory: "/opt/app/datafile/logs" + log_directory: "/var/log/ONAP" tls_info: cert_directory: '/opt/app/datafile/etc/cert/' use_tls: true - type: dcae.nodes.ContainerizedPlatformComponent -- cgit 1.2.3-korg