From 4cb2f5d3c13d48b62338cf6fba004ca2e03eed77 Mon Sep 17 00:00:00 2001
From: hammad zafar <hammad.zafar@xflowresearch.com>
Date: Tue, 23 Feb 2021 20:28:50 +0500
Subject: [PATCH] updated VNFPerformanceManagementNotification-API

---
 ...manceInformationAvaliableNotification.json |   1 +
 ...manceInformationAvailableNotification.json |   1 +
 ...formationAvailableNotification.schema.json | 187 +++++++++---------
 3 files changed, 93 insertions(+), 96 deletions(-)

diff --git a/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json b/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
index 5ac84f0a..6350a483 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
@@ -2,6 +2,7 @@
 	"id":"",
 	"notificationType":"PerformanceInformationAvailableNotification",
 	"timeStamp":"",
+	"pmJobId":"",
 	"objectType":"",
 	"objectInstanceId":"{objectInstanceId}",
 	"_links":{{
diff --git a/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json b/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
index cbe45fa7..b1ae3c47 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
+++ b/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
@@ -3,6 +3,7 @@
 	"notificationType" : "PerformanceInformationAvailableNotification",
 	"subscriptionId ": "subscriptionId",
 	"timeStamp": "2012-04-21T18:25:43-05:00",
+    "pmJobId": "",
 	"objectInstanceId": "vnfID",
 	"_links": {
 			"subscription": "link to subscription",
diff --git a/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
index 04ae7ead..512c2640 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
+++ b/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
@@ -1,105 +1,100 @@
 {
-    "description": "This notification informs the receiver that performance information is available. The timing of sending this notification is determined by the capability of the producing entity to evaluate the threshold crossing condition. The notification shall be triggered by the VNFM when new performance information collected by a PM job is available.\n",
-    "type": "object",
-    "required": [
-      "id",
-      "notificationType",
-      "subscriptionId",
-      "timeStamp",
-      "objectInstanceId",
-      "_links"
-    ],
-    "properties": {
-      "id": {
-        "description": "An identifier with the intention of being globally unique.\n",
+  "description": "This notification informs the receiver that performance information is available. The notification shall be triggered by the VNFM when new performance information collected by a PM job is available. The periodicity of triggering this notification is influenced by the  \"reportingPeriod\" attribute in the \"PmJobCriteria\" data structure.\n",
+  "type": "object",
+  "required": [
+    "id",
+    "notificationType",
+    "timeStamp",
+    "pmJobId",
+    "objectType",
+    "objectInstanceId",
+    "_links"
+  ],
+  "properties": {
+    "id": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "notificationType": {
+      "description": "Discriminator for the different notification types. Shall be set to \"PerformanceInformationAvailableNotification\" for this notification type.\n",
+      "type": "string",
+      "enum": [
+        "PerformanceInformationAvailableNotification"
+      ]
+    },
+    "timeStamp": {
+      "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+      "type": "string",
+      "format": "date-time"
+    },
+    "pmJobId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "objectType": {
+      "description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+      "type": "string"
+    },
+    "objectInstanceId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "subObjectInstanceIds": {
+      "description": "Identifiers of the sub-object instances of the measured object instance for which the measurements have been taken. Shall be present if the related PM job has been set up to measure only a subset of all sub-object instances of the measured object instance and a sub-object is defined in clause\n 6.2 of ETSI GS NFV-IFA 027 for the related measured object type.\nShall be absent otherwise.\n",
+      "type": "array",
+      "items": {
+        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
         "type": "string"
-      },
-      "notificationType": {
-        "description": "Discriminator for the different notification types. Shall be set to \"PerformanceInformationAvailableNotification\" for this notification type.\n",
-        "type": "string",
-        "enum": [
-          "PerformanceInformationAvailableNotification"
-        ]
-      },
-      "subscriptionId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "timeStamp": {
-        "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-        "type": "string",
-        "format": "date-time"
-      },
-      "objectInstanceId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "_links": {
-        "description": "Links to resources related to this notification.\n",
-        "type": "object",
-        "required": [
-          "subscription",
-          "pmJob",
-          "performanceReport"
-        ],
-        "properties": {
-          "subscription": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          },
-          "objectInstance": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
+      }
+    },
+    "_links": {
+      "description": "Links to resources related to this notification.\n",
+      "type": "object",
+      "required": [
+        "pmJob",
+        "performanceReport"
+      ],
+      "properties": {
+        "objectInstance": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
-          },
-          "pmJob": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
+          }
+        },
+        "pmJob": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
-          },
-          "performanceReport": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
+          }
+        },
+        "performanceReport": {
+          "description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
             }
           }
         }
       }
     }
-  }
\ No newline at end of file
+  }
+}
\ No newline at end of file
-- 
GitLab