Update the VES Collector default blueprint

Issue-ID: DCAEGEN2-2264
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: I8df7653e57c4dcf6abc97465fdf7cb74751185eb

diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index d261b10..10beb2f 100644 (file)
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -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.1"
+    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
@@ -94,7 +94,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 +102,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"

diff --git a/pom.xml b/pom.xml
index 0e59641..3582431 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>2.0.3-SNAPSHOT</version>
+  <version>2.0.4-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 

diff --git a/version.properties b/version.properties
index 214049a..b292db5 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2\r
 minor=0\r
-patch=3\r
+patch=4\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r