Merge "Update VES Collector schema and properties"

4 files changed, 50 insertions, 1 deletions

diff --git a/src/test/resources/testcollector.properties b/src/test/resources/testcollector.properties
index c3fcca62..3001001c 100644
--- a/src/test/resources/testcollector.properties
+++ b/src/test/resources/testcollector.properties
@@ -3,7 +3,7 @@ collector.service.secure.port=8443
 collector.keystore.file.location=../etc/keystore

 collector.keystore.passwordfile=./etc/passwordfile

 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.json\"}

+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.json\",\"v7\":\"./etc/CommonEventFormat_30.2_ONAP.json\"}

 collector.dmaap.streamid=fault=sec_fault|syslog=sec_syslog|heartbeat=sec_heartbeat|measurementsForVfScaling=sec_measurement|mobileFlow=sec_mobileflow|other=sec_other|stateChange=sec_statechange|thresholdCrossingAlert=sec_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling

 collector.dmaapfile=./etc/DmaapConfig.json

 auth.method=noAuth

diff --git a/src/test/resources/ves7_invalid.json b/src/test/resources/ves7_invalid_30_1_1_event.json
index 74c0a92f..74c0a92f 100644
--- a/src/test/resources/ves7_invalid.json
+++ b/src/test/resources/ves7_invalid_30_1_1_event.json
diff --git a/src/test/resources/ves7_valid.json b/src/test/resources/ves7_valid_30_1_1_event.json
index 19116b15..19116b15 100644
--- a/src/test/resources/ves7_valid.json
+++ b/src/test/resources/ves7_valid_30_1_1_event.json
diff --git a/src/test/resources/ves7_valid_eventWithStndDefinedFields.json b/src/test/resources/ves7_valid_eventWithStndDefinedFields.json
new file mode 100644
index 00000000..5d40b9d9
--- /dev/null
+++ b/src/test/resources/ves7_valid_eventWithStndDefinedFields.json
@@ -0,0 +1,49 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "domain": "stndDefined",
+      "eventId": "stndDefined-gNB_Nokia000001",
+      "eventName": "stndDefined-gNB-Nokia-PowerLost",
+      "stndDefinedNamespace": "3GPP-FaultSupervision",
+      "lastEpochMicrosec": 1234567890,
+      "priority": "Normal",
+      "reportingEntityName": "Nokia123456",
+      "sequence": 0,
+      "sourceName": "Nokia123456",
+      "startEpochMicrosec": 1234567890,
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2"
+    },
+    "stndDefinedFields": {
+      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "data": {
+        "header": {
+          "uri": "xyz",
+          "notificationId": "xyz",
+          "notificationType": "notifyNewAlarm",
+          "eventTime": "xyz",
+          "systemDN": "xyz"
+        },
+        "body": {
+          "probableCause": "xyz",
+          "perceivedSeverity": "Major",
+          "rootCauseIndicator": false,
+          "specificProblem": "xyz",
+          "correlatedNotifications": [],
+          "backedUpStatus": true,
+          "backUpObject": "xyz",
+          "trendIndication": "No change",
+          "thresholdInfo": {},
+          "stateChangeDefinition": [],
+          "monitoredAttributes": [],
+          "proposedRepairActions": "xyz",
+          "additionalText": "xyz",
+          "additionalInformation": [],
+          "alarmId": "xyz",
+          "alarmType": "Environmental Alarm"
+        }
+      },
+      "stndDefinedFieldsVersion": "1.0"
+    }
+  }
+}
\ No newline at end of file