Post stndDefined implementation fixes

Update componentspec with stndDefined properties and latest VES version.
Update ConsulConfig to match actual VES properties.
Fix 7.30.2 dataformat version name to match MOD requirments.
Update external-schema-manager version to 1.4.3
and update properties format to JSON path notation.

Change-Id: Ib01dc20de0a864beb275aec8b0dae793e588251c
Signed-off-by: Michal Banka <michal.banka@nokia.com>
Issue-ID: DCAEGEN2-2264

6 files changed, 50 insertions, 10 deletions

diff --git a/Changelog.md b/Changelog.md
index 73291b42..c0b2b0a6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -26,4 +26,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.7.3] - 10/08/2020
         - [DCAEGEN2-2264](https://jira.onap.org/browse/DCAEGEN2-2264) - Add implementation of stndDefined fields validation
 ## [1.7.4] - 04/08/2020
-        - [DCAEGEN2-2212](https://jira.onap.org/browse/DCAEGEN2-2212) - Config fetch for VESCollector through DCAE-SDK (CBS Client)        
+        - [DCAEGEN2-2212](https://jira.onap.org/browse/DCAEGEN2-2212) - Config fetch for VESCollector through DCAE-SDK (CBS Client)
+        - [DCAEGEN2-2264](https://jira.onap.org/browse/DCAEGEN2-2264) - Post stndDefined implementation fixes        
diff --git a/dpo/data-formats/ConsulConfig.json b/dpo/data-formats/ConsulConfig.json
index dc04abcf..f2276194 100644
--- a/dpo/data-formats/ConsulConfig.json
+++ b/dpo/data-formats/ConsulConfig.json
@@ -68,11 +68,11 @@
       }
     }
   },
-  "collector.externalSchema.2ndStageValidation": 1,
+  "collector.externalSchema.checkflag": 1,
   "collector.externalSchema.schemasLocation": "./etc/externalRepo",
   "collector.externalSchema.mappingFileLocation": "./etc/externalRepo/schema-map.json",
-  "collector.externalSchema.schemaRefPath": "/event/stndDefinedFields/schemaReference",
-  "collector.externalSchema.stndDefinedDataPath": "/event/stndDefinedFields/data",
+  "event.externalSchema.schemaRefPath": "$.event.stndDefinedFields.schemaReference",
+  "event.externalSchema.stndDefinedDataPath": "$.event.stndDefinedFields.data",
   "collector.service.secure.port": "8443",
   "auth.method": "noAuth",
   "collector.keystore.file.location": "/opt/app/VESCollector/etc/keystore",
diff --git a/dpo/data-formats/VES-7.30.2_ONAP-dataformat.json b/dpo/data-formats/VES-7.30.2_ONAP-dataformat.json
index ec6c261f..f38d54e5 100644
--- a/dpo/data-formats/VES-7.30.2_ONAP-dataformat.json
+++ b/dpo/data-formats/VES-7.30.2_ONAP-dataformat.json
@@ -5,11 +5,10 @@
     "description": "VES spec for v7.2"
   },
   "dataformatversion": "1.0.0",
-
     "reference": {
         "name": "Common Event Format",
         "format": "JSON",
-        "version": "30.2",
+        "version": "30.2.0",
         "url" : "https://git.onap.org/dcaegen2/collectors/ves/tree/etc/CommonEventFormat_30.2_ONAP.json"
    }
 }
diff --git a/dpo/spec/vescollector-componentspec.json b/dpo/spec/vescollector-componentspec.json
index 65972c65..5c3e4d9b 100644
--- a/dpo/spec/vescollector-componentspec.json
+++ b/dpo/spec/vescollector-componentspec.json
@@ -1,6 +1,6 @@
 {
   "self": {
-    "version": "1.5.4",
+    "version": "1.7.4",
     "name": "dcae-ves-collector",
     "description": "Collector for receiving VES events through restful interface",
     "component_type": "docker"
@@ -293,6 +293,46 @@
       "sourced_at_deployment": false,
       "policy_editable": false,
       "designer_editable": false
+    },
+    {
+      "name": "collector.externalSchema.checkflag",
+      "value": 1,
+      "description": "Schema stndDefined validation flag. When enabled, collector will validate stndDefined fields in stndDefined domain events against mapped local schemas listed in file from property collector.externalSchema.mappingFileLocation.",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": true
+    },
+    {
+      "name": "collector.externalSchema.schemasLocation",
+      "value": "./etc/externalRepo/",
+      "description": "External schemas repository. Path to schemas storage directory.",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "collector.externalSchema.mappingFileLocation",
+      "value": "./etc/externalRepo/schema-map.json",
+      "description": "Path to JSON file containing mapping of externally located stndDefined schemas to local schema files.",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "event.externalSchema.schemaRefPath",
+      "value": "$.event.stndDefinedFields.schemaReference",
+      "description": "An internal path from validated JSON. Defines which field is taken as public schema reference, which is later mapped.",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
+    },
+    {
+      "name": "event.externalSchema.stndDefinedDataPath",
+      "value": "$.event.stndDefinedFields.data",
+      "description": "An internal path from validated JSON. Defines which field of event will be validated during stndDefined validation.",
+      "sourced_at_deployment": false,
+      "policy_editable": false,
+      "designer_editable": false
     }
   ],
   "auxilary": {
diff --git a/etc/collector.properties b/etc/collector.properties
index b0bffaac..7482c5a8 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -57,8 +57,8 @@ collector.schema.file={\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./e
 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

+event.externalSchema.schemaRefPath=$.event.stndDefinedFields.schemaReference

+event.externalSchema.stndDefinedDataPath=$.event.stndDefinedFields.data

 

 

 ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile

diff --git a/pom.xml b/pom.xml
index 561eca6b..1b4510b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <spring-boot-starter-test.version>2.1.0.RELEASE</spring-boot-starter-test.version>

     <api-custom-header.version>1.1.4</api-custom-header.version>

     <functionaljava.version>4.8.1</functionaljava.version>

-    <external-schema-manager.version>1.4.1</external-schema-manager.version>

+    <external-schema-manager.version>1.4.3</external-schema-manager.version>

     <sdk.version>1.4.2</sdk.version>

   </properties>

   <build>