summaryrefslogtreecommitdiffstats
path: root/dpo
diff options
context:
space:
mode:
Diffstat (limited to 'dpo')
-rw-r--r--dpo/data-formats/ConsulConfig.json7
-rw-r--r--dpo/data-formats/VES-7.30.2_ONAP-dataformat.json3
-rw-r--r--dpo/spec/vescollector-componentspec.json50
3 files changed, 54 insertions, 6 deletions
diff --git a/dpo/data-formats/ConsulConfig.json b/dpo/data-formats/ConsulConfig.json
index dc04abcf..168eda06 100644
--- a/dpo/data-formats/ConsulConfig.json
+++ b/dpo/data-formats/ConsulConfig.json
@@ -68,14 +68,15 @@
}
}
},
- "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",
+ "collector.description.api.version.location": "etc/api_version_description.json",
"services_calls": [],
"header.authlist": "sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6"
}
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 de97d9bd..a861dfb2 100644
--- a/dpo/spec/vescollector-componentspec.json
+++ b/dpo/spec/vescollector-componentspec.json
@@ -240,7 +240,7 @@
},
{
"name": "collector.dmaap.streamid",
- "value": "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|perf3gpp=ves-perf3gpp|stndDefined=ves-other",
+ "value": "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",
"description": "domain-to-streamid mapping used by VESCollector to distributes events based on domain. Both primary and secondary config_key are included for resilency (multiple streamid can be included commma separated). The streamids MUST match to topic config_keys. For single site without resiliency deployment - configkeys with -secondary suffix can be removed",
"sourced_at_deployment": true,
"policy_editable": false,
@@ -293,6 +293,54 @@
"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
+ },
+ {
+ "name": "collector.description.api.version.location",
+ "value": "etc/api_version_description.json",
+ "description": "Path to the file containing description of api versions",
+ "sourced_at_deployment": false,
+ "policy_editable": false,
+ "designer_editable": false
}
],
"auxilary": {