Implement differences between v3.5.1 and v3.6.1 for SOL002

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

@@ -16,7 +16,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.4.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V3.5.1

src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml

@@ -4,7 +4,30 @@
 definitions:
   Alarm:
     description: >
-      The alarm data type encapsulates information about an alarm.
+      The alarm data type encapsulates information about an alarm. It shall comply with the provisions defined in 
+      table 7.5.2.4-1.
+
+      If the attribute "faultType" has the value "NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE", 
+      the following provisions apply for the values of the attribute "faultDetails" related to 
+      changes in the state of virtualised resources:
+        - One of the entries in the array shall provide information about the anticipated time of maintenance in the
+          following format: "anticipatedTime=$time", wherein "$time" shall be formatted as a "DateTime", as specified
+          in ETSI GS NFV-SOL 013 [6].
+        - One of the entries in the array shall provide identification information about the affinity/anti-affinity group
+          defined in the VNFD that is associated to the affected virtualised resource indicated by "rootCauseFaultyResource" 
+          in the following format: "affinityOrAntiAffinityGroupId=$group", wherein "$group" shall be equal to the 
+          "affinityOrAntiAffinityGroupId" value in the corresponding "VduProfile" (for a VNFC/COMPUTE affected resource) 
+          or "VirtualLinkProfile" for a VL/NETWORK affected resource) in the VNFD, which is mapped by the VNFM to the 
+          virtualised resource group identifier in the virtualised resource change notification received by the VNFM from 
+          the VIM.
+
+      NOTE 1: For an alarm about upcoming impact due to NFVI operation and maintenance (i.e. the attribute "faultType" 
+              has the value "NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE"), the attribute "rootCauseFaultyResource" 
+              indicates a resource to be impacted. Further information on the upcoming impact (e.g. group of impacted 
+              resources, time of impact) is provided in the attribute "faultDetails".
+      NOTE 2: When alarms are due to upcoming NFVI operation and maintenance (i.e. the attribute "faultType" has the
+              value "NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE"), the attribute "faultDetails" shall include information 
+              about the anticipated time of the maintenance. See provisions under the present table.
     type: object
     required:
       - id
@@ -36,7 +59,8 @@ definitions:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
       rootCauseFaultyResource:
         description: >
-          The virtualised resources that are causing the VNF fault.
+          The virtualised resources that are causing the VNF fault. Shall be present if the alarm affects 
+          virtualised resources. See note 1.
         $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FaultyResourceInfo"
       alarmRaisedTime:
         description: >
@@ -75,7 +99,7 @@ definitions:
         $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType"
       eventTime:
         description: >
-          Time stamp indicating when the fault was observed.
+          Time stamp indicating when the fault was observed. See note 2.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
       eventType:
         description: >
@@ -85,10 +109,19 @@ definitions:
       faultType:
         description: >
           Additional information to clarify the type of the fault.
+          If the alarm is related to changes in the state of virtualised resources due to NFVI 
+          operation and maintenance, this attribute shall be set to "NFVI_OAM_VIRTUALISED_RESOURCE_STATE _CHANGE".
         type: string
       probableCause:
         description: >
           Information about the probable cause of the fault.
+          If the attribute "faultType" has the value “NFVI_OAM_VIRTUALISED_RESOURCE_STATE_CHANGE”, the 
+          permitted values are: 
+            - "NFVI_COMPONENT_MAINTENANCE": Maintenance of NFVI components, e.g. physical maintenance/repair, 
+              hypervisor software updates, etc.
+            - "NFVI_COMPONENT_EVACUATION": Evacuation of physical hosts.
+            - "NFVI_COMPONENT_OPTIMIZATION": Operation and management of NFVI resources, e.g. to support energy
+              efficiency or resource usage optimization.
         type: string
       isRootCause:
         description: >
@@ -104,7 +137,7 @@ definitions:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
       faultDetails:
         description: >
-          Provides additional information about the fault.
+          Provides additional information about the fault. See notes 1 and 2.
         type: array
         items:
           type: string

src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml

@@ -16,7 +16,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.4.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V3.5.1

src/SOL002/VNFIndicator/VNFIndicator.yaml

@@ -16,7 +16,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.3.1-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V3.5.1

src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml

@@ -16,7 +16,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.3.1-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V3.5.1

src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml

@@ -16,7 +16,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V3.5.1

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

@@ -352,7 +352,13 @@ definitions:
               supported for this VNF instance and is possible based on the current status of this
               VNF instance resource (i.e., VNF instance is in INSTANTIATED state).
             $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
-
+          changeCurrentVnfPkg:
+            description: >
+              Link to the "Change current VNF package task" resource, if the related operation is 
+              possible based on the current status of this VNF instance resource (i.e. VNF instance is 
+              in INSTANTIATED state).
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
+            
   InstantiateVnfRequest:
     description: >
       This type represents request parameters for the "Instantiate VNF" operation.
@@ -377,7 +383,12 @@ definitions:
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
       extVirtualLinks:
         description: >
-          Information about external VLs to connect the VNF to.
+          Information about external VLs to connect the VNF to, including configuration information 
+          for the CPs via which the VNF instance can attach to this VL.
+          The following applies to the "ExtVirtualLinkData" information provided in this request: Even 
+          if the VNF is not instantiated in fully scaled-out state, the API consumer shall provide enough 
+          CP configuration records to allow connecting the VNF instance, fully scaled out in all scaling 
+          aspects, to the external VLs.
         type: array
         items:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData"
@@ -435,7 +446,15 @@ definitions:
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
       extVirtualLinks:
         description: >
-          Information about external VLs to connect the VNF to.
+          Information about external VLs to connect the VNF to, including configuration information 
+          for the CPs via which the VNF instance can attach to this VL. 
+          Entries in the list of external VLs that are unchanged need not be supplied as part of 
+          this request.
+          The following applies to the "ExtVirtualLinkData" information provided in this request, together 
+          with the related "ExtVirtualLinkInfo" information known to the VNFM represented in the "VnfInstance" 
+          structure (see clause 5.5.2.2): Even if the VNF is not in fully scaled-out state after changing the 
+          flavour, the API consumer shall provide enough CP configuration records to allow connecting the VNF 
+          instance, fully scaled out in all scaling aspects, to the external VLs.
         type: array
         items:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData"
@@ -587,7 +606,14 @@ definitions:
     properties:
       extVirtualLinks:
         description: >
-          Information about external VLs to change (e.g. connect the VNF to).
+          Information about external VLs to change (e.g. connect the VNF to) including configuration information 
+          for the CPs via which the VNF instance can attach to this VL.
+          Entries in the list of external VLs that are unchanged need not be supplied as part of this request.
+          The following applies to the "ExtVirtualLinkData" information provided in this request, together with the
+          related "ExtVirtualLinkInfo" information known to the VNFM represented in the "VnfInstance" structure (see
+          clause 5.5.2.2): Even if the VNF is not in fully scaled-out state, the API consumer shall provide enough CP
+          configuration records to allow connecting the VNF instance, fully scaled out in all scaling aspects, to the
+          external VLs.
         type: array
         items:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData"
@@ -617,8 +643,15 @@ definitions:
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
       extVirtualLinks:
         description: >
-          Information about external VLs to connect the VNF to. Entries in the list that are unchanged need not be
-          supplied as part of this request.
+          Information about external VLs to connect the VNF to,  including configuration information for
+          the CPs via which the VNF instance can attach to this VL.
+          Entries in the list that are unchanged need not be supplied as part of this request.
+          The following applies to the "ExtVirtualLinkData" information provided in this request, together
+          with the related "ExtVirtualLinkInfo" information known to the VNFM represented in the
+          "VnfInstance" structure (see clause 5.5.2.2): Even if the VNF is not in fully scaled-out state
+          after the change of the VNF package, the API consumer shall provide enough CP configuration
+          records to allow connecting the VNF instance, fully scaled out in all scaling aspects, to the
+          external VLs.
         type: array
         items:
           $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData"
@@ -1029,6 +1062,10 @@ definitions:
                 exposes an external CP. A VNFC CP is "exposed as" an external CP if it is connected directly
                 to an external VL.
       * NOTE 3:	The information can be omitted because it is already available as part of the external CP information.
+      * NOTE 4: If only the value or the presence of this attribute is changed in the "VnfcResourceInfo" structure by 
+                an LCM operation occurrence, this does not represent a change that requires including a related "AffectedVnfc"
+                structure in the VNF LCM operation occurrence notifications or the "VnfLcmOpOcc" structure related to 
+                this LCM operation occurrence.
     type: object
     required:
       - id
@@ -1047,7 +1084,7 @@ definitions:
         description: >
           Identifier of the VNFD.
           Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change
-          current VNF package" operation or due to its final failure).
+          current VNF package" operation or due to its final failure). See note 4.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
       computeResource:
         description: >
@@ -1123,6 +1160,10 @@ definitions:
     description: >
       This type represents the information that allows addressing a virtualised
       resource that is used by an internal VL instance in a VNF instance.
+      NOTE: If only the value or the presence of this attribute is changed in the "VnfVirtualLinkResourceInfo" 
+            structure by an LCM operation occurrence, this does not represent a change that requires including a 
+            related "AffectedVirtualLink" structure in the VNF LCM operation occurrence notifications or the 
+            "VnfLcmOpOcc" structure related to this LCM operation occurrence.
     type: object
     required:
       - id
@@ -1142,7 +1183,7 @@ definitions:
         description: >
           Identifier of the VNFD.
           Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change
-          current VNF package" operation or due to its final failure).
+          current VNF package" operation or due to its final failure). See note.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
       networkResource:
         description: >
@@ -1171,6 +1212,11 @@ definitions:
     description: >
       This type represents the information that allows addressing a virtualised
       resource that is used by a VNF instance.
+      
+      NOTE: If only the value or the presence of this attribute is changed in the "VirtualStorageResourceInfo"
+      structure by an LCM operation occurrence, this does not represent a change that requires 
+      including a related "AffectedVirtualStorage" structure in the VNF LCM operation occurrence 
+      notifications or the "VnfLcmOpOcc" structure related to this LCM operation occurrence.
     type: object
     required:
       - id
@@ -1189,7 +1235,7 @@ definitions:
         description: >
           Identifier of the VNFD.
           Shall be present in case the value differs from the vnfdId attribute of the VnfInstance (e.g. during a "Change
-          current VNF package" operation or due to its final failure).
+          current VNF package" operation or due to its final failure). See note.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
       storageResource:
         description: >
@@ -1768,6 +1814,7 @@ definitions:
           Signals the type of change.
           Permitted values:
           -	ADDED
+          - MODIFIED
           -	REMOVED
         type: string
         enum:

src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml

@@ -16,7 +16,7 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 2.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
   description: ETSI GS NFV-SOL 002 V3.5.1

src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml

@@ -46,6 +46,7 @@ definitions:
                 the "changeType" attribute of "AffectedVirtualLink" structure equal to "ADDED", and another
                 "AffectedVirtualLink" entry signals the addition of VNF link ports of the VL by using the
                 "changeType" equal to "LINK_PORT_ADDED".
+        NOTE 3: Not more than one of changedInfo and modificationsTriggeredByVnfPkgChange shall be present.
     type: object
     required:
       - id
@@ -159,8 +160,8 @@ definitions:
           changed VNF configurable properties.
           Shall be present if the "notificationStatus" is set to "RESULT" and
           the operation has performed any changes to VNF instance information,
-          including VNF configurable properties.
-          Shall be absent otherwise.
+          including VNF configurable properties. Shall be absent otherwise. See 
+          note 3.
         $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
       affectedVipCps:
         description: >
@@ -189,8 +190,8 @@ definitions:
         description: >
           Information about performed changes of "VnfInstance" attributes triggered by changing the current VNF package.
           Shall be present if the "notificationStatus" is set to "RESULT", the "operation" attribute is equal to
-          "CHANGE_VNFPKG", the "verbosity" attribute is set to "FULL" and the operation has performed any changes to VNF
-          instance information, including VNF configurable properties. Shall be absent otherwise.
+          "CHANGE_VNFPKG", the "verbosity" attribute is set to "FULL" and the operation has performed any changes to 
+          "VnfInstance" attributes. Shall be absent otherwise. See note 3
         $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange"
       error:
         description: >