Small error corrections

 - VnfLcmOperationOccurrenceNotification.changedInfo should be VnfInfoModifications, not VnfInfoModificationRequest
 - vnfInstanceName shouldn't be part of VnfIdentifierCreationNotification

Change-Id: Ie4d2f1785b6997ed408dbcfeed109e2dcae61879
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>

src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml

@@ -951,49 +951,6 @@ definitions:
         items:
           $ref: "#/definitions/DynamicNetworkAddressData"
 
-  VnfIdentifierCreationNotification:
-    description: >
-      This type represents a VNF identifier creation notification, which
-      informs the receiver of the creation of a new VNF instance resource and
-      the associated VNF instance identifier.
-    type: object
-    required: 
-      - id
-      - notificationType
-      - timeStamp
-      - vnfInstanceId
-      - _links
-    properties:
-      id:
-        description: >
-          Identifier of this notification. If a notification is sent multiple
-          times due to multiple subscriptions, the "id" attribute of all these
-          notifications shall have the same value.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      notificationType:
-        description: >
-          Discriminator for the different notification types. Shall be set to
-          "VnfIdentifierCreationNotification" for this notification type.
-        type: string
-        enum:
-          - VnfIdentifierCreationNotification
-      subscriptionId:
-        description: >
-          Identifier of the subscription that this notification relates to.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      timeStamp:
-        description: >
-          Date-time of the generation of the notification.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
-      vnfInstanceId:
-        description: >
-          The created VNF instance identifier.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      _links:
-        description: >
-          Links to resources related to this notification.
-        $ref: "#/definitions/LccnLinks"
-
   VnfIdentifierDeletionNotification:
     description: >
       This type represents a VNF identifier deletion notification, which
@@ -1037,53 +994,6 @@ definitions:
           Links to resources related to this notification.
         $ref: "#/definitions/LccnLinks"
 
-  VnfInfoModifications:
-    # Ref TBD
-    description: >
-      This type represents attribute modifications for an
-      "Individual VNF instance" resource, i.e. modifications to a resource
-      representation based on the "VnfInstance" data type. The attributes of
-      "VnfInstance" that can be modified according to the provisions in
-      clause 5.5.2.2 are included in the "VnfInfoModifications" data type.
-    type: object
-    properties:
-      vnfInstanceName:
-        description: >
-          New value of the "vnfInstanceName" attribute in "VnfInstance", or
-          "null" to remove the attribute.      
-        type: string
-      vnfInstanceDescription:
-        description: >
-          New value of the "vnfInstanceDescription" attribute in
-          "VnfInstance", or "null" to remove the attribute.  
-        type: string
-      onboardedVnfPkgInfoId:
-        description: >
-          New value of the "onboardedVnfPkgInfoId" attribute in "VnfInstance".
-          The value "null" is not permitted.  
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      vnfConfigurableProperties:
-        description: >
-          Modifications of the "vnfConfigurableProperties" attribute in
-          "VnfInstance". If present, these modifications shall be applied
-          according to the rules of JSON Merge PATCH (see IETF RFC 7396).
-        $ref: "#/definitions/KeyValuePairs"
-      vnfcInfoModifications:
-        description: TBD
-        type: string
-      metadata:
-        description: >
-          Modifications of the "metadata" attribute in "VnfInstance". If
-          present, these modifications shall be applied according to the rules
-          of JSON Merge PATCH (see IETF RFC 7396).
-        $ref: "#/definitions/KeyValuePairs"
-      extensions:
-        description: >
-          Modifications of the "extensions" attribute in "VnfInstance". If
-          present, these modifications shall be applied according to the rules
-          of JSON Merge PATCH (see IETF RFC 7396).
-        $ref: "#/definitions/KeyValuePairs"
-
   VnfInstance:
     # Ref TBD
     description: >
@@ -1180,181 +1090,6 @@ definitions:
         type: array
         items: 
           type: string
-
-  VnfLcmOperationOccurrenceNotification:
-    description: >
-      This type represents a VNF lifecycle management operation occurrence
-      notification, which informs the receiver of changes in the VNF
-      lifecycle caused by a VNF LCM operation occurrence. The support of the
-      notification is mandatory.
-      This notification is produced when there is a change in the VNF
-      lifecycle caused by a VNF LCM operation occurrence, including:
-      * Instantiation of the VNF
-      * Scaling of the VNF instance (including auto-scaling)
-      * Healing of the VNF instance (including auto-healing)
-      * Change of the state of the VNF instance (i.e. Operate VNF)
-      * Change of the deployment flavour of the VNF instance
-      * Change of the external virtual links of the VNF instance
-      * Termination of the VNF instance
-      * Modification of VNF instance information and/or VNF configurable
-        properties through the "PATCH" method on the "Individual VNF instance"
-        resource
-      If this is the initial notification about the start of a VNF LCM
-      operation occurrence, it is assumed that the notification is sent by the
-      VNFM before any action (including sending the grant request) is taken,
-      however, after acknowledging the LCM operation request to the consumer.
-      Due to possible race conditions, this does not guarantee that the
-      notification will also arrive at the NFVO before the grant request, and
-      after the acknowledgement of the operation. It is not an error if the
-      "start" notification, the grant request and the LCM operation
-      acknowledgment arrive out of order at the NFVO, and the NFVO shall be
-      able to handle such a situation.
-      If this is a notification about a final or intermediate result state of
-      a VNF LCM operation occurrence, the notification shall be sent after
-      all related actions of the LCM operation that led to this state have 
-      been executed. The new state shall be set in the VnfLcmOpOcc resource
-      before the notification about the state change is sent.
-    type: object
-    required:
-      - id
-      - notificationType
-      - timeStamp
-      - notificationStatus
-      - operationState
-      - vnfInstanceId
-      - operation
-      - isAutomaticInvocation
-      - vnfLcmOpOccId
-      - _links
-    properties:
-      id:
-        description: >
-          Identifier of this notification. If a notification is sent multiple
-          times due to multiple subscriptions, the "id" attribute of all these
-          notifications shall have the same value.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      notificationType:
-        description: >
-          Discriminator for the different notification types. Shall be set to
-          "VnfLcmOperationOccurrenceNotification" for this notification type.
-        type: string
-        enum:
-          - VnfLcmOperationOccurrenceNotification
-      subscriptionId:
-        description: >
-          Identifier of the subscription that this notification relates to.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      timeStamp:
-        description: >
-          Date-time of the generation of the notification.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
-      notificationStatus:
-        description: >
-          Indicates whether this notification reports about the start of a
-          lifecycle operation or the result of a lifecycle operation.
-          Permitted values:
-          * START: Informs about the start of the VNF LCM operation
-            occurrence.
-          * RESULT: Informs about the final or intermediate result of the VNF
-            LCM operation occurrence.
-        type: string
-        enum: 
-          - START
-          - RESULT
-      operationState:
-        description: >
-          The state of the VNF LCM operation occurrence.
-        $ref: "#/definitions/LcmOperationStateType"
-      vnfInstanceId:
-        description: >
-          The identifier of the VNF instance affected.          
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      operation:
-        description: >
-          The lifecycle management operation.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType"
-      isAutomaticInvocation:
-        description: >
-          Set to true if this VNF LCM operation occurrence has been triggered
-          by an automated procedure inside the VNFM 
-          (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf
-          triggered by auto-heal).
-          Set to false otherwise.
-        type: boolean
-      vnfLcmOpOccId:
-        description: >
-          The identifier of the VNF lifecycle management operation occurrence
-          associated to the notification.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      affectedVnfcs:
-        description: >
-          Information about VNFC instances that were affected during the
-          lifecycle operation.
-          Shall be present if the "notificationStatus" is set to "RESULT" and
-          the operation has performed any resource modification. Shall be
-          absent otherwise. This attribute contains information about the
-          cumulative changes to virtualised resources that were performed so
-          far by the VNF LCM operation occurrence and by any of the error
-          handling procedures for that operation occurrence.
-        type: array
-        items:
-          $ref: "#/definitions/AffectedVnfc"
-      affectedVirtualLinks:
-        description: >
-          Information about VL instances that were affected during the
-          lifecycle operation.
-          Shall be present if the "notificationStatus" is set to "RESULT" and
-          the operation has performed any resource modification. Shall be
-          absent otherwise. This attribute contains information about the
-          cumulative changes to virtualised resources that were performed so
-          far by the VNF LCM operation occurrence and by any of the error
-          handling procedures for that operation occurrence.
-        type: array
-        items:
-          $ref: "#/definitions/AffectedVirtualLink"
-      affectedVirtualStorages:
-        description: >
-          Information about virtualised storage instances that were affected
-          during the lifecycle operation.
-          Shall be present if the "notificationStatus" is set to "RESULT" and
-          the operation has performed any resource modification. Shall be
-          absent otherwise. This attribute contains information about the
-          cumulative changes to virtualised resources that were performed so
-          far by the VNF LCM operation occurrence and by any of the error
-          handling procedures for that operation occurrence.
-        type: array
-        items:
-          $ref: "#/definitions/AffectedVirtualStorage"
-      changedInfo:
-        description: >
-          Information about the changed VNF instance information, including
-          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.
-        $ref: "#/definitions/VnfInfoModifications"
-      changedExtConnectivity:
-        description: >
-          Information about changed external connectivity, if this
-          notification represents the result of a lifecycle operation
-          occurrence. Shall be present if the "notificationStatus" is set to
-          "RESULT" and the "operation" is set to "CHANGE_EXT_CONN". 
-          Shall be absent otherwise.
-        type: array
-        items:
-          $ref: "#/definitions/ExtVirtualLinkInfo"
-      error:
-        description: >
-          Details of the latest error, if one has occurred during executing
-          the LCM operation. Shall be present if the "operationState"
-          attribute is "FAILED_TEMP" or "FAILED", and shall be absent
-          otherwise.
-        $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
-      _links:
-        description: >
-          Links to resources related to this notification.
-        $ref: "#/definitions/LccnLinks"
         
   VnfLcmOpOcc:
     description: >

src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml

@@ -153,7 +153,7 @@ definitions:
           the operation has performed any changes to VNF instance information,
           including VNF configurable properties. 
           Shall be absent otherwise.
-        $ref: "../../definitions/SOL003_def.yaml#/definitions/VnfInfoModificationRequest"
+        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
       changedExtConnectivity:
         description: >
           Information about changed external connectivity, if this

src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml

@@ -727,13 +727,6 @@ definitions:
         type: string
         enum:
           - VnfIdentifierCreationNotification
-      vnfInstanceName:
-        description: >
-          Discriminator for the different notification types. Shall be set to
-          "VnfIdentifierCreationNotification" for this notification type.
-        type: string
-        enum:
-          - VnfIdentifierCreationNotification
       subscriptionId:
         description: >
           Identifier of the subscription that this notification relates to.