SOL002_24->SOL002_28: Datatypes updated

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

@@ -13,7 +13,6 @@ definitions:
       - vnfProductName
       - vnfSoftwareVersion
       - vnfdVersion
-      - vnfPkgInfoId
       - instantiationState
       - _links
     properties:
@@ -60,12 +59,6 @@ definitions:
         description: >
           Identifies the version of the VNFD. The value is copied from the VNFD.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
-      vnfPkgId:
-        description: >
-          Identifier of information held by the NFVO about the specific VNF
-          package on which the VNF is based. This identifier was allocated by the
-          NFVO. This attribute can be modified with the PATCHmethod.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
       vnfConfigurableProperties:
         description: >
           Additional VNF-specific attributes that provide the current values 
@@ -119,7 +112,6 @@ definitions:
           - flavourId
           - vnfState
           - extCpInfo
-          - _links
         properties:
           flavourId:
             description: >
@@ -183,19 +175,25 @@ definitions:
             type: array
             items:
               $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcResourceInfo"
-          virtualLinkResourceInfo:
+          vnfVirtualLinkResourceInfo:
             description: >
               Information about the virtualised network resources used by the VLs
               of the VNF instance.
             type: array
             items:
               $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfVirtualLinkResourceInfo"
-          virtualStorageResourceInfo:
+          vnfVirtualStorageResourceInfo:
             description: >
               Information on the virtualised storage resource(s) used as storage for the VNF instance.
             type: array
             items:
               $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VirtualStorageResourceInfo"
+          vnfcInfo:
+            description: >
+              Information about the VNFC instances.
+            type: array
+            items:
+              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfo"
       metadata:
         description: >
           Additional VNF-specific attributes that provide metadata describing the VNF instance.
@@ -347,18 +345,15 @@ definitions:
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
       extensions:
         description: >
-          If present, this attribute provides values for the "extensions" attribute in "VnfInstance",
-          as defined in clause 5.5.2.2. If an entry with the same key exists in the VnfInstance data structure,
-          the VNFM shall replace its value with the value passed in the InstantiateVnfRequest data structure.
+          If present, this attribute provides modifications to the default values, as obtained from the VNFD, of the
+          "extensions" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling extensions
+          during the operation are defined in clause 5.4.4.3.1.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
       vnfConfigurableProperties:
         description: >
-          This parameter provides values for the VNF configurable
-          properties attribute in the "VnfInstance", as defined in
-          clause 5.5.2.2. If an entry with the same key exists in the
-          VnfInstance data structure, the VNFM shall replace its
-          value with the value passed in the InstantiateVnfRequest
-          data structure.
+          If present, this attribute provides modifications to the default values, as obtained from the VNFD, of the VNF
+          configurable properties attribute in the "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling
+          configurable properties during the operation are defined in clause 5.4.4.3.1.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
 
   ChangeVnfFlavourRequest:
@@ -396,6 +391,18 @@ definitions:
           to the VNF being instantiated, as declared in the VNFD as part of
           "InstantiateVnfOpConfig".
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      extensions:
+        description: >
+          If present, this attribute provides modifications to the values of the "extensions" attribute in "VnfInstance",
+          as defined in clause 5.5.2.2. Provisions for handling extensions during the operation, are defined in clause
+          5.4.7.3.1.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
+      vnfConfigurableProperties:
+        description: >
+          If present, this attribute provides modifications to the values of the VNF configurable properties attribute in
+          the "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling VNF configurable properties during the
+          operation, are defined in clause 5.4.7.3.1.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
 
   TerminateVnfRequest:
     type: object
@@ -406,11 +413,24 @@ definitions:
         description: >
           Indicates the type of termination is requested.
           Permitted values:
-          * FORCEFUL: The VNFM will shut down the VNF and release the
-            resources immediately after accepting the request.
+          * FORCEFUL: The VNFM will shut down the VNF and release the resources immediately after accepting the request.
+          * GRACEFUL: The VNFM will first arrange to take the VNF out of service after accepting the request. Once the
+            operation of taking the VNF out of service finishes (irrespective of whether it has succeeded or failed) or
+            once the timer value specified in the "gracefulTerminationTimeout" attribute expires, the VNFM will shut down
+            the VNF and release the resources.
         type: string
         enum:
           - FORCEFUL
+          - GRACEFUL
+      gracefulTerminationTimeout:
+        description: >
+          This attribute is only applicable in case of graceful termination. It defines the time to wait for the VNF to be
+          taken out of service before shutting down the VNF and releasing the resources.
+          The unit is seconds. If not given and the "terminationType" attribute is set to "GRACEFUL", it is expected that
+          the VNFM waits for the successful taking out of service of the VNF, no matter how long it takes, before shutting
+          down the VNF and releasing the resources.
+        type: integer
+
       additionalParams:
         description: >
           Additional parameters passed by the NFVO as input to the termination

src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml

@@ -22,11 +22,9 @@ definitions:
         type: string
       metadata:
         description: >
-          If present, this attribute provides values for the "metadata" attribute in "VnfInstance",
-          as defined in clause 5.5.2.2.
-          If a “metadata” entry in this CreateVnfRequest data structure has a corresponding default
-          value declared in the VNFD, the value in the “metadata” entry in the CreateVnfRequest
-          structure takes precedence.
+          If present, this attribute provides additional initial values, overriding those obtained from the VNFD, for
+          the "metadata" attribute in "VnfInstance", as defined in clause 5.5.2.2. Provisions for handling metadata
+          during the operation are defined in clause 5.4.2.3.1.
         $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
 
   ScaleVnfRequest: