Update CSIT resources for VES 1.7.3 version

Updated events to contain valid stndDefined fields.
Updated collector.properties to actual fields names.
Fixed typo.

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

7 files changed, 214 insertions, 155 deletions

diff --git a/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json b/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json
index 5d40b9d9..99b7ce37 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves7_valid_eventWithStndDefinedFields.json
@@ -1,47 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "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"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "header": {
-          "uri": "xyz",
-          "notificationId": "xyz",
-          "notificationType": "notifyNewAlarm",
-          "eventTime": "xyz",
-          "systemDN": "xyz"
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
+        "notificationType": "notifyNewAlarm",
+        "eventTime": "xyz",
+        "systemDN": "xyz",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
+        "rootCauseIndicator": false,
+        "specificProblem": "xyz",
+        "correlatedNotifications": [],
+        "backedUpStatus": true,
+        "backUpObject": "xyz",
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
+        "proposedRepairActions": "xyz",
+        "additionalText": "xyz",
+        "additionalInformation": {
+          "addInfo": "new"
         },
-        "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"
-        }
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
index aa026e71..0d749f30 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-FaultSupervision.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "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"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
index 7e274c20..414904f5 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Heartbeat.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-Heartbeat",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
index 06520396..8e1f697f 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-PerformanceAssurance.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-PerformanceAssurance",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
index d9406615..bb37d1e2 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_3GPP-Provisioning.json
@@ -1,43 +1,52 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "3GPP-Provisioning",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
index bf5f0953..49812e80 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_empty_namespace.json
@@ -1,45 +1,54 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
       "stndDefinedNamespace": "",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
index 230dc54e..a5a16d12 100644
--- a/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
+++ b/tests/dcaegen2/testcases/assets/json_events/ves_stdnDefined_missing_namespace.json
@@ -1,44 +1,53 @@
 {
   "event": {
     "commonEventHeader": {
+      "version": "4.1",
+      "vesEventListenerVersion": "7.2",
       "domain": "stndDefined",
       "eventId": "stndDefined-gNB_Nokia000001",
       "eventName": "stndDefined-gNB-Nokia-PowerLost",
-      "lastEpochMicrosec": 1234567890,
-      "priority": "Normal",
-      "reportingEntityName": "Nokia123456",
-      "sequence": 0,
-      "sourceName": "Nokia123456",
-      "startEpochMicrosec": 1234567890,
-      "version": "4.1",
-      "vesEventListenerVersion": "7.2"
+      "startEpochMicrosec": 1413378172000000,
+      "lastEpochMicrosec": 1413378172000000,
+      "reportingEntityName": "ibcx0001vm002oam001",
+      "sourceName": "scfx0001vm002cap001",
+      "sequence": 1,
+      "priority": "High"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://www.3gpp.org/Rel-16/TS28532_generic_fault_supervision.json#definitions/schemas/notifyNewAlarm-NotifType",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/data-models/blob/REL-16/OpenAPI/faultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
-        "uri": "xyz",
-        "notificationId": "xyz",
+        "href": 1,
+        "uri": "1",
+        "notificationId": 1,
         "notificationType": "notifyNewAlarm",
         "eventTime": "xyz",
         "systemDN": "xyz",
-        "probableCause": "xyz",
-        "perceivedSeverity": "Major",
+        "probableCause": 1,
+        "perceivedSeverity": "INDETERMINATE",
         "rootCauseIndicator": false,
         "specificProblem": "xyz",
         "correlatedNotifications": [],
         "backedUpStatus": true,
         "backUpObject": "xyz",
-        "trendIndication": "No change",
-        "thresholdInfo": {},
-        "stateChangeDefinition": [],
-        "monitoredAttributes": [],
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123
+        },
+        "stateChangeDefinition": {
+        },
+        "monitoredAttributes": {
+          "newAtt": "new"
+        },
         "proposedRepairActions": "xyz",
         "additionalText": "xyz",
-        "additionalInformation": [],
-        "alarmId": "xyz",
-        "alarmType": "Environmental Alarm"
+        "additionalInformation": {
+          "addInfo": "new"
+        },
+        "alarmId": "1",
+        "alarmType": "COMMUNICATIONS_ALARM"
       },
       "stndDefinedFieldsVersion": "1.0"
     }
   }
-}
+}
\ No newline at end of file