[DCAE] Adapt DCAE blueprints to CFY DCAE K8S plugin version 3.x.x

[dcaegen2/platform/blueprints.git] / blueprints / k8s-ves.yaml

diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index b1674e1..ace8c1a 100644 (file)
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - plugin:k8splugin?version=2.0.0
+  - plugin:k8splugin?version=3.3.0
 
 inputs:
   ves_other_publish_url:
@@ -45,7 +45,7 @@ inputs:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_PNFREG_OUTPUT"
   tag_version:
     type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.0"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.3"
   internal_port:
     type: string
     description: Kubernetes node port on which collector is exposed
@@ -71,6 +71,12 @@ inputs:
   dns_component_name:
     type: string
     default: "dcae-ves-collector"
+  service_component_type:
+    type: string
+    default: "dcae-ves-collector"
+  service_id:
+    type: string
+    default: "dcae-ves-collector"
   enable_tls:
     type: boolean
     default: false
@@ -94,7 +100,7 @@ node_templates:
               - concat: [{get_input: internal_port_tls},":",{get_input: external_port_tls}]
     properties:
       application_config:
-        collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|measurement=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|stndDefined=ves-other
+        collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance
         collector.inputQueue.maxPending: "8096"
         collector.keystore.file.location: /opt/app/dcae-certificate/cert.jks
         collector.keystore.passwordfile: /opt/app/dcae-certificate/jks.pass
@@ -102,6 +108,11 @@ node_templates:
         collector.truststore.passwordfile: /opt/app/dcae-certificate/trust.pass
         collector.schema.checkflag: "1"
         collector.schema.file: "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.2_ONAP.json\"}"
+        collector.externalSchema.checkflag: 1
+        collector.externalSchema.schemasLocation: ./etc/externalRepo/
+        collector.externalSchema.mappingFileLocation: ./etc/externalRepo/schema-map.json
+        event.externalSchema.schemaRefPath: /event/stndDefinedFields/schemaReference
+        event.externalSchema.stndDefinedDataPath: /event/stndDefinedFields/data
         collector.service.port: "8080"
         collector.service.secure.port: "8443"
         event.transform.flag: "0"
@@ -151,14 +162,12 @@ node_templates:
       image:
         get_input: tag_version
       replicas: {get_input: replicas}
-      name:
-        get_input: component_name
-      dns_name:
-        get_input: dns_component_name
+      service_component_type: { get_input: service_component_type }
+      service_id: { get_input: service_id }
       log_info:
         log_directory: "/opt/app/VESCollector/logs"
       tls_info:
         cert_directory: '/opt/app/dcae-certificate/'
         use_tls:
           get_input: enable_tls
-    type: dcae.nodes.ContainerizedPlatformComponent
+    type: dcae.nodes.ContainerizedServiceComponent