From 5a001d626d7b8cf81e14814f4b0ba8820c33b6a2 Mon Sep 17 00:00:00 2001
From: Edyta Krukowska <edyta.krukowska@nokia.com>
Date: Mon, 31 Aug 2020 17:46:58 +0200
Subject: Update VES CFY blueprint covering routing and 2nd stage of validation

Issue-ID: DCAEGEN2-2410
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: I273de7f77a9040c2205743547b07a3c6b6fba468
---
 blueprints/k8s-ves.yaml | 51 +++++++++++++++++++++++++++++++++++++++++++++----
 pom.xml                 |  2 +-
 version.properties      |  2 +-
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index ace8c1a..bf8a855 100644
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -43,6 +43,18 @@ inputs:
   ves_pnfRegistration_publish_url:
     type: string
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_PNFREG_OUTPUT"
+  ves_3gpp_fault_supervision_publish_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT"
+  ves_3gpp_provisioning_publish_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT"
+  ves_3gpp_hearbeat_publish_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT"
+  ves_3gpp_performance_assurance_publish_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT"
   tag_version:
     type: string
     default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.7.3"
@@ -88,7 +100,15 @@ inputs:
     type: string
     description: List of user,password separated by pipe; pwd should be generated by using crypt-password tool (https://nexus.onap.org/#nexus-search;quick~crypt-password)
     default: "sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6|demouser,$2a$10$1cc.COcqV/d3iT2N7BjPG.S6ZKv2jpb9a5MV.o7lMih/GpjJRX.Ce"
-
+  collector_externalSchema_checkflag:
+    type: integer
+    default: 1
+  collector_externalSchema_schemasLocation:
+    type: string
+    default: "./etc/externalRepo/"
+  collector_externalSchema_mappingFileLocation:
+    type: string
+    default: "./etc/externalRepo/schema-map.json"
 node_templates:
   ves:
     interfaces:
@@ -108,9 +128,12 @@ 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
+        collector.externalSchema.checkflag:
+          get_input: collector_externalSchema_checkflag
+        collector.externalSchema.schemasLocation:
+          get_input: collector_externalSchema_schemasLocation
+        collector.externalSchema.mappingFileLocation:
+          get_input: collector_externalSchema_mappingFileLocation
         event.externalSchema.schemaRefPath: /event/stndDefinedFields/schemaReference
         event.externalSchema.stndDefinedDataPath: /event/stndDefinedFields/data
         collector.service.port: "8080"
@@ -152,6 +175,26 @@ node_templates:
               topic_url:
                 get_input: ves_other_publish_url
             type: message_router
+          ves-3gpp-fault-supervision:
+            dmaap_info:
+              topic_url:
+                get_input: ves_3gpp_fault_supervision_publish_url
+            type: message_router
+          ves-3gpp-provisioning:
+            dmaap_info:
+              topic_url:
+                get_input: ves_3gpp_provisioning_publish_url
+            type: message_router
+          ves-3gpp-heartbeat:
+            dmaap_info:
+              topic_url:
+                get_input: ves_3gpp_hearbeat_publish_url
+            type: message_router
+          ves-3gpp-performance-assurance:
+            dmaap_info:
+              topic_url:
+                get_input: ves_3gpp_performance_assurance_publish_url
+            type: message_router
         collector.dynamic.config.update.frequency: "5"
       docker_config:
         healthcheck:
diff --git a/pom.xml b/pom.xml
index b560fcd..7703279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,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.1.2-SNAPSHOT</version>
+  <version>2.1.3-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <packaging>pom</packaging>
 
diff --git a/version.properties b/version.properties
index 56a8b6d..796f86d 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2
 minor=1
-patch=2
+patch=3
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg