SOL002 VNF Configuration - Implementation of deltas between v4.3.1 and v3.6.1

This merge request refers to the implementation of deltas between v4.3.1 and v3.6.1 of SOL002 VNF Configuration Interface.

@lynchpi @matsuurat @sayama @hamza @ayuba @ishaqm @reinaortega

Deadline for review: Friday 13th January 2023 @6pm CET

Merge request reports

Loading
+6 −0
Changes for SOL002/VNFConfiguration-API/environment/variables.txt: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,8 +13,14 @@ ${AUTHORIZATION_TOKEN} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42

${CONTENT_TYPE}    application/json

${HEADER_TEST_SUPPORTED}    0

${apiRoot}        /
${apiName}        vnfconfig
${apiMajorVersion}     v1

${etag}    enter-etag-value-for-testing-mismatch-condition

${cpId}  
${cpdId}
${vnfcInstanceId}
+0 −1
Changes for SOL002/VNFConfiguration-API/jsons/vnfConfigModifications.json: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@
        }
      ]
    },
    "dhcpServer": "string",
    "vnfSpecificData": {}
  },
  "vnfcConfigurationData": [
+19 −0
Changes for SOL002/VNFConfiguration-API/jsons/vnfConfigModificationsWithVnfConfigurationData.json: 19 added lines, 0 removed lines.
Original line number Diff line number Diff line
{{
  "vnfConfigurationData": {
    "extCpConfig": {
      "cpId": "{cpId}",
      "cpdId": "{cpdId}",
      "addresses": [
        {
          "address": {
            "macAddress": "string",
            "ipAddress": "string"
          },
          "useDynamicAddress": true,
          "port": 0
        }
      ]
    },
    "vnfSpecificData": {}
  }
}}
 No newline at end of file
+26 −0
Changes for SOL002/VNFConfiguration-API/jsons/vnfConfigModificationsWithvnfcConfigurationData.json: 26 added lines, 0 removed lines.
Original line number Diff line number Diff line
{{
  "vnfcConfigurationData": [
    {
      "vnfcInstanceId": "{vnfcInstanceId}",
      "intCpConfig": [
        {
          "cpId": "{cpId}",
          "cpdId": "{cpdId}",
          "addresses": [
            {
              "address": {
                "macAddress": "string",
                "ipAddress": "string"
              },
              "useDynamicAddress": true,
              "port": 0
            }
          ]
        }
      ],
      "dhcpServer": "string",
      "vnfcSpecificData": {}
    }
  ],
  "vnfcConfigurationDataDeleteIds": []
}}
 No newline at end of file
+2 −7
Changes for SOL002/VNFConfiguration-API/schemas/vnfConfigModifications.schema.json: 2 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@
  ],
  "properties": {
    "vnfConfigurationData": {
      "description": "This type represents configuration parameters of a VNF instance.\n",
      "description": "This type represents configuration parameters of a VNF instance. *   NOTE:\tETSI GS NFV-SOL 001 specifies the structure and format of\n          the VNFD based on TOSCA specifications.\n",
      "type": "object",
      "properties": {
        "extCpConfig": {
@@ -99,11 +99,6 @@
            }
          }
        },
        "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",
          "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 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"
@@ -114,7 +109,7 @@
      "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",
        "description": "This type represents configuration parameters of a VNFC instance. *   NOTE:\tETSI GS NFV-SOL 001 specifies the structure and format\n          of the VNFD based on TOSCA specifications.\n",
        "type": "object",
        "required": [
          "vnfcInstanceId"
Loading
Loading