fix ves stndDefined schema references according to VES-image-configured

- in addition alarms for R18 were added

Issue-ID: OAM-439
Change-Id: I397697c0387902a5b65402a3b169fe8b515201a5
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>

diff --git a/code/client-scripts-ves-v7/json/templates/stndDefined-heartbeat.json b/code/client-scripts-ves-v7/json/templates/stndDefined-heartbeat.json
index 34e302c..e66db4b 100644 (file)
--- a/code/client-scripts-ves-v7/json/templates/stndDefined-heartbeat.json
+++ b/code/client-scripts-ves-v7/json/templates/stndDefined-heartbeat.json
@@ -21,7 +21,7 @@
       "vesEventListenerVersion": "7.2.1"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/-/raw/Rel-16/OpenAPI/TS28532_HeartbeatNtf.yaml#components/schemas/NotifyHeartbeat",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_HeartbeatNtf.yaml#components/schemas/NotifyHeartbeat",
       "data": {
         "href": "href1",
         "notificationId": 0,

diff --git a/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-cleared-alarm.json b/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-cleared-alarm.json
index 1e8d833..220b56e 100644 (file)
--- a/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-cleared-alarm.json
+++ b/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-cleared-alarm.json
@@ -21,7 +21,7 @@
       "vesEventListenerVersion": "7.2.1"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/-/raw/Rel-16/OpenAPI/TS28532_FaultMnS.yaml#components/schemas/NotifyClearedAlarm",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FaultMnS.yaml#components/schemas/NotifyClearedAlarm",
       "data": {
         "href": "href1",
         "notificationId": 0,

diff --git a/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-file-ready.json b/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-file-ready.json
index 5fbcc11..169a363 100644 (file)
--- a/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-file-ready.json
+++ b/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-file-ready.json
@@ -21,7 +21,7 @@
       "vesEventListenerVersion": "7.2.1"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/-/raw/Rel-16/OpenAPI/TS28532_FileDataReportingMnS.yaml#components/schemas/NotifyFileReady",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FileDataReportingMnS.yaml#components/schemas/NotifyFileReady",
       "data": {
         "href": "href1",
         "notificationId": 0,

diff --git a/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-new-alarm.json b/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-new-alarm.json
index fea0de0..0e9720f 100644 (file)
--- a/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-new-alarm.json
+++ b/code/client-scripts-ves-v7/json/templates/stndDefined-r16-notify-new-alarm.json
@@ -21,7 +21,7 @@
       "vesEventListenerVersion": "7.2.1"
     },
     "stndDefinedFields": {
-      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/-/raw/Rel-16/OpenAPI/TS28532_FaultMnS.yaml#components/schemas/NotifyNewAlarm",
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-16/OpenAPI/TS28532_FaultMnS.yaml#components/schemas/NotifyNewAlarm",
       "data": {
         "href": "href1",
         "notificationId": 0,

diff --git a/code/client-scripts-ves-v7/json/templates/stndDefined-r18-notify-cleared-alarm.json b/code/client-scripts-ves-v7/json/templates/stndDefined-r18-notify-cleared-alarm.json
new file mode 100644 (file)
index 0000000..dc1ef94
--- /dev/null
+++ b/code/client-scripts-ves-v7/json/templates/stndDefined-r18-notify-cleared-alarm.json
@@ -0,0 +1,41 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "domain": "@domain@",
+      "eventId": "@eventId@",
+      "eventName": "@domain@_@eventType@_Alarms_@alarm@",
+      "eventType": "@eventType@_Alarms",
+      "sequence": 0,
+      "priority": "Low",
+      "reportingEntityId": "",
+      "reportingEntityName": "@controllerName@",
+      "sourceId": "",
+      "sourceName": "@pnfId@",
+      "startEpochMicrosec": "@timestamp@",
+      "lastEpochMicrosec": "@timestamp@",
+      "nfNamingCode": "@type@",
+      "nfVendorName": "@vendor@",
+      "timeZoneOffset": "+00:00",
+      "version": "4.1",
+      "stndDefinedNamespace": "3GPP-FaultSupervision",
+      "vesEventListenerVersion": "7.2.1"
+    },
+    "stndDefinedFields": {
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28111_FaultNrm.yaml#components/schemas/NotifyClearedAlarm",
+      "data": {
+        "href": "href1",
+        "notificationId": 0,
+        "notificationType": "notifyClearedAlarm",
+        "eventTime": "@eventTime@",
+        "systemDN": "xyz",
+        "alarmId": "@alarm@",
+        "alarmType": "COMMUNICATIONS_ALARM",
+        "probableCause": "@alarm@",
+        "perceivedSeverity": "@severity@",
+        "clearUserId": "@vendor@",
+        "clearSystemId": "@vendor@"
+      },
+      "stndDefinedFieldsVersion": "1.0"
+    }
+  }
+}

diff --git a/code/client-scripts-ves-v7/json/templates/stndDefined-r18-notify-new-alarm.json b/code/client-scripts-ves-v7/json/templates/stndDefined-r18-notify-new-alarm.json
new file mode 100644 (file)
index 0000000..f75f3a0
--- /dev/null
+++ b/code/client-scripts-ves-v7/json/templates/stndDefined-r18-notify-new-alarm.json
@@ -0,0 +1,61 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "domain": "@domain@",
+      "eventId": "@eventId@",
+      "eventName": "@domain@_@eventType@_Alarms_@alarm@",
+      "eventType": "@eventType@_Alarms",
+      "sequence": 0,
+      "priority": "Low",
+      "reportingEntityId": "",
+      "reportingEntityName": "@controllerName@",
+      "sourceId": "",
+      "sourceName": "@pnfId@",
+      "startEpochMicrosec": "@timestamp@",
+      "lastEpochMicrosec": "@timestamp@",
+      "nfNamingCode": "@type@",
+      "nfVendorName": "@vendor@",
+      "timeZoneOffset": "+00:00",
+      "version": "4.1",
+      "stndDefinedNamespace": "3GPP-FaultSupervision",
+      "vesEventListenerVersion": "7.2.1"
+    },
+    "stndDefinedFields": {
+      "schemaReference": "https://forge.3gpp.org/rep/sa5/MnS/raw/Rel-18/OpenAPI/TS28111_FaultNrm.yaml#components/schemas/NotifyNewAlarm",
+      "data": {
+        "href": "href1",
+        "notificationId": 0,
+        "notificationType": "notifyNewAlarm",
+        "eventTime": "@eventTime@",
+        "systemDN": "xyz",
+        "alarmId": "@alarm@",
+        "alarmType": "COMMUNICATIONS_ALARM",
+        "probableCause": "@alarm@",
+        "specificProblem": "@alarm@",
+        "perceivedSeverity": "@severity@",
+        "backedUpStatus": true,
+        "backUpObject": "xyz",
+        "trendIndication": "MORE_SEVERE",
+        "thresholdInfo": {
+          "observedMeasurement": "new",
+          "observedValue": 123.1
+        },
+        "correlatedNotifications": [],
+        "stateChangeDefinition": [{ "operational-state": "DISABLED" }],
+        "monitoredAttributes": {
+          "interface": "@interface@"
+        },
+        "proposedRepairActions": "Call the police!",
+        "additionalText": "O-RAN Software Community OAM",
+        "additionalInformation": {
+          "eventTime": "@eventTime@",
+          "equipType": "@type@",
+          "vendor": "@vendor@",
+          "model": "@model@"
+        },
+        "rootCauseIndicator": false
+      },
+      "stndDefinedFieldsVersion": "1.0"
+    }
+  }
+}
\ No newline at end of file