Commit 65988d63 authored by Muhammad Hamza's avatar Muhammad Hamza
Browse files

Remove and separate common SOL002 SOL003 LCM definitions

parent 9375d173

src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml

+9 −9
Original line number Diff line number Diff line
@@ -1367,7 +1367,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest

      required: true



    VnfInstanceModificationRequest:
@@ -1375,7 +1375,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModificationRequest

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModificationRequest

      required: true



    VnfInstanceInstantiationRequest:
@@ -1391,7 +1391,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest

      required: true



    VnfInstanceScaleToLevelRequest:
@@ -1399,7 +1399,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest

      required: true



    VnfInstanceChangeFlavourRequest:
@@ -1458,7 +1458,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest

      required: true



    VnfInstanceCreateSnapshotRequest:
@@ -1634,7 +1634,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification



    IndividualVnfInstance.Delete.409:

      description: |
@@ -2855,7 +2855,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription



    Subscriptions.Post.201:

      description: |
@@ -2894,7 +2894,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription



    IndividualSubscription.Get.200:

      description: |
@@ -2925,7 +2925,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription

            $ref: definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription



    IndividualSubscription.Delete.204:

      description: |

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

+1397 −21

File changed.

Preview size limit exceeded, changes collapsed.

src/SOL002/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification

            $ref: ../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification

      required: true



    VnfIdentifierDeletionNotification:
@@ -209,7 +209,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: ../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierDeletionNotification

            $ref: ../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfIdentifierCreationNotification

      required: true



  responses:

src/SOL002/VNFLifecycleManagementNotification/definitions/SOL002VNFLifecycleManagementNotification_def.yaml

+7 −7
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ definitions: 
      operationState:

        description: >

          The state of the VNF LCM operation occurrence.

        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOperationStateType"

        $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LcmOperationStateType"

      vnfInstanceId:

        description: >

          The identifier of the VNF instance affected.
@@ -120,7 +120,7 @@ definitions: 
          This attribute signals the verbosity of the notification. If it is not present, it shall default to the value "FULL".

          If the value is "SHORT", full change details can be obtained by performing a GET request on the "Individual LCM

          operation occurrence" resource that is signalled by the "vnfLcmOpOcc" child attribute of the "_links" attribute.

        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LcmOpOccNotificationVerbosityType"

        $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LcmOpOccNotificationVerbosityType"

      vnfLcmOpOccId:

        description: >

          The identifier of the VNF lifecycle management operation occurrence
@@ -174,7 +174,7 @@ definitions: 
          VIP CP instances that have been added, deleted or modified shall be provided.

        type: array

        items:

          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp"

          $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp"

      affectedVirtualCps:

        description: >

          Information about virtual CP instances that were affected during the execution of the
@@ -182,7 +182,7 @@ definitions: 
          management operation occurrence.

        type: array

        items:

          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp"

          $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp"

      changedExtConnectivity:

        description: >

          Information about changed external connectivity, if this
@@ -193,14 +193,14 @@ definitions: 
          Shall be absent otherwise.

        type: array

        items:

          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo"

          $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ExtVirtualLinkInfo"

      modificationsTriggeredByVnfPkgChange:

        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 

          "VnfInstance" attributes. Shall be absent otherwise. See note 3

        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange"

        $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/ModificationsTriggeredByVnfPkgChange"

      error:

        description: >

          Details of the latest error, if one has occurred during executing
@@ -211,4 +211,4 @@ definitions: 
      _links:

        description: >

          Links to resources related to this notification.

        $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnLinks"
 
 No newline at end of file
 
        $ref: "../../VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/LccnLinks"
 
 No newline at end of file

src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml

+28 −48
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest"

            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/CreateVnfRequest"

      required: true



    VnfInfoModificationRequest:
@@ -1456,7 +1456,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest"

            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest"

      required: true



    ScaleVnfToLevelRequest:
@@ -1464,7 +1464,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest"

            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest"

      required: true



    ChangeVnfFlavourRequest:
@@ -1523,7 +1523,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest"

            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscriptionRequest"

      required: true



    CreateVnfSnapshotRequest:
@@ -3437,7 +3437,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription"

            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription"



    Subscriptions.Post.303:

      description: |
@@ -3486,22 +3486,14 @@ components: 
      description: |

        422 Unprocessable Entity



        Shall be returned upon the following error: The

        content type of the payload body is supported

        and the payload body of a request contains

        syntactically correct data but the data cannot be

        processed.

        The general cause for this error and its handling

        is specified in clause 6.4 of ETSI

        GS NFV-SOL 013 [8], including rules for the

        presence of the response body.

        Specifically in case of this resource, the response

        code 422 shall also be returned if the VNFM has

        tested the Notification endpoint as described in

        clause 5.4.20.3.2 and the test has failed.

        In this case, the "detail" attribute in the

        "ProblemDetails" structure shall convey more

        information about the error

        Shall be returned upon the following error: The content type of the payload body is supported

        and the payload body of a request contains syntactically correct data but the data cannot be processed.

        The general cause for this error and its handling is specified in clause 6.4 of ETSI

        GS NFV-SOL 013 [8], including rules for the presence of the response body.

        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has

        tested the Notification endpoint as described in clause 5.4.20.3.2 and the test has failed.

        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more

        information about the error.

      headers:

        Location:

          description: |
@@ -3584,7 +3576,7 @@ components: 
          schema:

            type: array

            items:

              $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription"

              $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription"



    IndividualSubscription.Get.200:

      description: |
@@ -3617,7 +3609,7 @@ components: 
      content:

        application/json:

          schema:

            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription"

            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/LccnSubscription"



    IndividualSubscription.Delete.204:

      description: |
@@ -3678,23 +3670,15 @@ components: 
      description: |

        404 NOT FOUND



        SShall be returned upon the following error: The API

         producer did not find a current representation for

         the target resource or is not willing to disclose that

         one exists.

         The general cause for this error and its handling is

         specified in clause 6.4 of ETSI

         GS NFV-SOL 013 [8], including rules for the

         presence of the response body.

         Specifically in case of this task resource, the

         response code 404 shall also be returned if the task

         is not supported for the VNF instance represented

         by the parent resource, which means that the task

        SShall be returned upon the following error: The API producer did not find a current representation for

        the target resource or is not willing to disclose that one exists.

        The general cause for this error and its handling is specified in clause 6.4 of ETSI

        GS NFV-SOL 013 [8], including rules for the presence of the response body.

        Specifically in case of this task resource, the response code 404 shall also be returned if the task

        is not supported for the VNF instance represented by the parent resource, which means that the task

        resource consequently does not exist.

         In this case, the response body shall be present,

         and shall contain a ProblemDetails structure, in

         which the "detail" attribute shall convey more

         information about the error

        In this case, the response body shall be present, and shall contain a ProblemDetails structure, in

        which the "detail" attribute shall convey more information about the error

      headers:

        WWW-Authenticate:

          description: |
@@ -4171,16 +4155,12 @@ components: 
      description: |

        412 Precondition Failed



        Shall be returned upon the following error: A

        precondition given in an HTTP request header is

        Shall be returned upon the following error: A precondition given in an HTTP request header is

        not fulfilled.

        Typically, this is due to an ETag mismatch,

        indicating that the resource was modified by

        Typically, this is due to an ETag mismatch, indicating that the resource was modified by

        another entity.

        The response body should contain a

        ProblemDetails structure, in which the "detail"

        attribute should convey more information about the

        error

        The response body should contain a ProblemDetails structure, in which the "detail"

        attribute should convey more information about the error.

      headers:

        WWW-Authenticate:

          description: |