SOL005 NS Performance Management - Implementation of deltas between v3.3.1 and v2.7.1

This merge request refers to the implementation of deltas between v3.3.1 and v2.7.1 of SOL005 NS Performance Management Interface.

@lynchpi @aelken @matsuurat @carignani @sayama @kraja @zulfiqar @zafar

Deadline for review: Thursday 18th March 2021 @6pm CET

Review period elapsed: Approved !!

SOL002/VNFConfiguration-API/schemas/vnfConfigModifications.schema.json

 {
-  "description": "This type represents request parameters for the \"Set Configuration\" operation.  * NOTE 1: At least one of \"vnfConfigurationData\" and \"vnfcConfigurationData\"\n            shall be present.\n  * NOTE 2: The VnfcConfiguration data type can only be used to modify the configuration\n            of existing VNFC instances.\n",
+  "description": "This type represents request parameters for the \"Set Configuration\" operation.\n  * NOTE 1: At least one of \"vnfConfigurationData\" and \"vnfcConfigurationData\"\n            shall be present.\n  * NOTE 2: The VnfcConfiguration data type can only be used to modify the configuration\n            of existing VNFC instances.\n",
   "type": "object",
+  "anyOf": [
+    {
+      "required": [
+        "vnfConfigurationData"
+      ]
+    },
+    {
+      "required": [
+        "vnfcConfigurationData"
+      ]
+    }
+  ],
   "properties": {
     "vnfConfigurationData": {
       "description": "This type represents configuration parameters of a VNF instance.\n",
       "type": "object",
       "properties": {
         "extCpConfig": {
-          "description": "This type represents configuration parameters of a CP instance.\n",
-          "type": "object",
-          "required": [
-            "cpId",
-            "cpdId",
-            "addresses"
-          ],
-          "properties": {
-            "cpId": {
-              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-              "type": "string"
-            },
-            "cpdId": {
-              "description": "An identifier that is unique within a VNF descriptor.\n",
-              "type": "string"
-            },
-            "addresses": {
-              "description": "Network address and port assigned to the CP.\n",
-              "type": "array",
-              "items": {
-                "description": "This type represents configuration parameters of a CP instance address.   *  NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n   *  NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
-                "type": "object",
-                "properties": {
-                  "address": {
-                    "description": "Network address that has been configured on the CP. See NOTE 1.\n",
-                    "type": "object",
-                    "properties": {
-                      "macAddress": {
-                        "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-                        "type": "string",
-                        "format": "MAC"
-                      },
-                      "ipAddress": {
-                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                        "type": "string",
-                        "format": "IP"
+          "description": "Configuration parameters for the external CPs of the VNF instance.\n",
+          "type": "array",
+          "items": {
+            "description": "This type represents configuration parameters of a CP instance.\n",
+            "type": "object",
+            "required": [
+              "cpId",
+              "cpdId",
+              "addresses"
+            ],
+            "properties": {
+              "cpId": {
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                "type": "string"
+              },
+              "cpdId": {
+                "description": "An identifier that is unique within a VNF descriptor.\n",
+                "type": "string"
+              },
+              "addresses": {
+                "description": "Network address and port assigned to the CP.\n",
+                "type": "array",
+                "items": {
+                  "description": "This type represents configuration parameters of a CP instance address.\n   *  NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n   *  NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
+                  "type": "object",
+                  "oneOf": [
+                    {
+                      "required": [
+                        "address"
+                      ]
+                    },
+                    {
+                      "required": [
+                        "useDynamicAddress"
+                      ]
+                    }
+                  ],
+                  "anyOf": [
+                    {
+                      "required": [
+                        "macAddress"
+                      ]
+                    },
+                    {
+                      "required": [
+                        "ipAddress"
+                      ]
+                    }
+                  ],
+                  "properties": {
+                    "address": {
+                      "description": "Network address that has been configured on the CP. See NOTE 1.\n",
+                      "type": "object",
+                      "properties": {
+                        "macAddress": {
+                          "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                          "type": "string",
+                          "format": "MAC"
+                        },
+                        "ipAddress": {
+                          "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                          "type": "string",
+                          "format": "IP"
+                        }
                       }
+                    },
+                    "useDynamicAddress": {
+                      "description": "Set to true if an address shall be assigned dynamically. Otherwise set to false. The default value shall be false. See NOTE 1.\n",
+                      "type": "boolean"
+                    },
+                    "port": {
+                      "description": "The port assigned to the CP instance (e.g. IP port number, Ethernet port number, etc.).\n",
+                      "type": "integer"
                     }
-                  },
-                  "useDynamicAddress": {
-                    "description": "Set to true if an address shall be assigned dynamically. Otherwise set to false. The default value shall be false. See NOTE 1.\n",
-                    "type": "boolean"
-                  },
-                  "port": {
-                    "description": "The port assigned to the CP instance (e.g. IP port number, Ethernet port number, etc.).\n",
-                    "type": "integer"
                   }
                 }
               }
@@ -60,18 +100,18 @@
           }
         },
         "dhcpServer": {
-          "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+          "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
           "type": "string",
           "format": "IP"
         },
         "vnfSpecificData": {
-          "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
+          "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
           "type": "object"
         }
       }
     },
     "vnfcConfigurationData": {
-      "description": "Modifications to configuration data for certain VNFC instances. See NOTE 1 and NOTE 2. If present, the modifications of the \"vnfcConfigurationData\" attribute shall follow these  provisions:  Modifying an attribute that is an array of objects of type \"VnfcConfigurationData\".\n    Assumptions:\n        1) \"oldList\" is the \"VnfcConfigurationData\" array to be modified and \"newList\"\n           is the \"VnfcConfigurationData\" array that contains the changes.\n        2) \"oldEntry\" is an entry in \"oldList\" and \"newEntry\" is an entry in \"newList\".\n        3) A \"newEntry\" has a \"corresponding entry\" if there exists an \"oldEntry\" that \n           has the same content of the \"vnfcInstanceId\" attribute as the \"newEntry\"; \n           a \"newEntry\" has no corresponding entry if no such \"oldEntry\" exists.\n        4) In any array of \"VnfcConfigurationData\" structures, the content of \"vnfcInstanceId\"\n           is unique (i.e. there shall be no two entries with the same content of \"vnfcInstanceId\").\n    Provisions:\n        1) For each \"newEntry\" in \"newList\" that has no corresponding entry in \"oldList\", \n           the \"oldList\" array shall be modified by adding that \"newEntry\".\n\n        2) For each \"newEntry\" in \"newList\" that has a corresponding \"oldEntry\" in \"oldList\",\n           the value of \"oldEntry\" shall be updated with the value of \"newEntry\" according to\n          the rules of JSON Merge PATCH (see IETF RFC 7396 ).\n",
+      "description": "Modifications to configuration data for certain VNFC instances. See NOTE 1 and NOTE 2. If present, the modifications of the \"vnfcConfigurationData\" attribute shall follow these provisions:\n  Modifying an attribute that is an array of objects of type \"VnfcConfigurationData\".\n    Assumptions:\n      1) \"oldList\" is the \"VnfcConfigurationData\" array to be modified and \"newList\"\n         is the \"VnfcConfigurationData\" array that contains the changes.\n      2) \"oldEntry\" is an entry in \"oldList\" and \"newEntry\" is an entry in \"newList\".\n      3) A \"newEntry\" has a \"corresponding entry\" if there exists an \"oldEntry\" that\n         has the same content of the \"vnfcInstanceId\" attribute as the \"newEntry\";\n         a \"newEntry\" has no corresponding entry if no such \"oldEntry\" exists.\n      4) In any array of \"VnfcConfigurationData\" structures, the content of \"vnfcInstanceId\"\n         is unique (i.e. there shall be no two entries with the same content of \"vnfcInstanceId\").\n    Provisions:\n      1) For each \"newEntry\" in \"newList\" that has no corresponding entry in \"oldList\",\n         the \"oldList\" array shall be modified by adding that \"newEntry\".\n\n      2) For each \"newEntry\" in \"newList\" that has a corresponding \"oldEntry\" in \"oldList\",\n         the value of \"oldEntry\" shall be updated with the value of \"newEntry\" according to\n        the rules of JSON Merge PATCH (see IETF RFC 7396 ).\n",
       "type": "array",
       "items": {
         "description": "This type represents configuration parameters of a VNFC instance.\n",
@@ -108,8 +148,32 @@
                   "description": "Network address and port assigned to the CP.\n",
                   "type": "array",
                   "items": {
-                    "description": "This type represents configuration parameters of a CP instance address.   *  NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n   *  NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
+                    "description": "This type represents configuration parameters of a CP instance address.\n   *  NOTE 1: Either \"address\" or \"useDynamicAddress\" shall be present.\n   *  NOTE 2: At least one of \"macAddress\" and \"ipAddress\" shall be present.\n",
                     "type": "object",
+                    "oneOf": [
+                      {
+                        "required": [
+                          "address"
+                        ]
+                      },
+                      {
+                        "required": [
+                          "useDynamicAddress"
+                        ]
+                      }
+                    ],
+                    "anyOf": [
+                      {
+                        "required": [
+                          "macAddress"
+                        ]
+                      },
+                      {
+                        "required": [
+                          "ipAddress"
+                        ]
+                      }
+                    ],
                     "properties": {
                       "address": {
                         "description": "Network address that has been configured on the CP. See NOTE 1.\n",
@@ -121,7 +185,7 @@
                             "format": "MAC"
                           },
                           "ipAddress": {
-                            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
                             "type": "string",
                             "format": "IP"
                           }
@@ -142,16 +206,24 @@
             }
           },
           "dhcpServer": {
-            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
             "type": "string",
             "format": "IP"
           },
           "vnfcSpecificData": {
-            "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
+            "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
             "type": "object"
           }
         }
       }
+    },
+    "vnfcConfigurationDataDeleteIds": {
+      "description": "List of identifiers entries to be deleted from the 'vnfcConfigurationData\" attribute array to be used as \"deleteIdList\" as defined below this table.\n",
+      "type": "array",
+      "items": {
+        "description": "An identifier with the intention of being globally unique.\n",
+        "type": "string"
+      }
     }
   }
 }
\ No newline at end of file