Commit 25906198 authored by Francesca Moscatelli's avatar Francesca Moscatelli
Browse files

Modifications according to v030006

parent f74299e8
Loading
Loading
Loading
Loading
+26 −14
Original line number Diff line number Diff line
@@ -958,7 +958,8 @@ paths:
      - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
    post:
      description: |
        The POST method requests creating a VNF snapshot resource based on a VNF instance resource.
        The POST method requests tacking a VNF instance snapshot and populating a previously created VNF snapshot resource
        (refer to clause 5.4.23.3.1) with the snapshot content.
      requestBody:
        $ref: '#/components/requestBodies/VnfInstanceCreateSnapshotRequest'
      responses:
@@ -1038,6 +1039,8 @@ paths:
    post:
      description: |
        The POST method creates a new individual VNF snapshot resource.
      requestBody:
        $ref: '#/components/requestBodies/VnfSnapshotsRequest'
      responses:
        "201":
          $ref: '#/components/responses/VnfSnapshots.Post'
@@ -1107,9 +1110,9 @@ paths:
        "504":
          $ref: ../../responses/SOL002SOL003_resp.yaml#/components/responses/504

  /vnf_snapshots/{vnfSnapshotId}:
  /vnf_snapshots/{vnfSnapshotInfoId}:
    parameters:
      - $ref: '#/components/parameters/VnfSnapshotId'
      - $ref: '#/components/parameters/VnfSnapshotInfoId'
      - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Version
      - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Authorization
    get:
@@ -1218,11 +1221,11 @@ components:
      schema:
        type: string

    VnfSnapshotId:
      name: vnfSnapshotId
    VnfSnapshotInfoId:
      name: vnfSnapshotInfoId
      in: path
      description: |
        Identifier of the individual VNF snapshot. This identifier can be retrieved from the resource referenced by the
        Identifier of the individual VNF snapshot resource. This identifier can be retrieved from the resource referenced by the
        "Location" HTTP header in the response to a POST request creating a new VNF snapshot resource. It can also be
        retrieved from the "id" attribute in the payload body of that response.
      required: true
@@ -1350,6 +1353,15 @@ components:
            $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/RevertToVnfSnapshotRequest
      required: true

    VnfSnapshotsRequest:
      description: |
        The VNF snapshot resource creation parameters.
      content:
        application/json:
          schema:
            $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/CreateVnfSnapshotInfoRequest
      required: true

  responses:
    VnfInstances.Get:
      description: |
@@ -1682,8 +1694,8 @@ components:
      description: |
        202 ACCEPTED
        The request has been accepted for processing. The response body shall be empty. The HTTP response shall include
        a "Location" HTTP header that contains the URI of the newly-created "VNF LCM operation occurrence" resource
        corresponding to the operation.
        a "Location" HTTP header that contains the URI of the newly-created "Individual VNF LCM operation occurrence"
        resource corresponding to the operation.
      headers:
        Version:
          description: The used API version.
@@ -2285,14 +2297,14 @@ components:
      content:
        application/json:
          schema:
            $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotRes
            $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo

    VnfSnapshots.Get:
      description: |
        200 OK
        Shall be returned when information about zero or more VNF snapshots was queried successfully.
        The response body shall contain in an array the representations of zero or more VNF snapshots,
        as defined in clause 5.5.2.21.
        The response body shall contain in an array the representations of zero or more individual VNF
        snapshot resources, as defined in clause 5.5.2.21.

        If the VNFM supports alternative 2 (paging) according to clause 5.4.2.1 of ETSI GS NFV-SOL 013
        for this resource, inclusion of the Link HTTP header in this response shall follow the provisions
@@ -2323,12 +2335,12 @@ components:
          schema:
            type: array
            items:
              $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotRes
              $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo

    IndividualVnfSnapshot.Get:
      description: |
        Shall be returned when information about an individual VNF snapshot was read successfully.
        The response body shall contain a representation of the VNF snapshot.
        The response body shall contain a representation of the individual VNF snapshot resource.
      headers:
        Version:
          description: The used API version.
@@ -2360,7 +2372,7 @@ components:
      content:
        application/json:
          schema:
            $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotRes
            $ref: ./definitions/SOL002VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo

    IndividualVnfSnapshot.Delete:
      description: |
+146 −76

File changed.

Preview size limit exceeded, changes collapsed.

+100 −41
Original line number Diff line number Diff line
@@ -236,15 +236,6 @@ definitions:
        type: array
        items:
          $ref: "#/definitions/VnfcInfoModifications"
      vnfcInfoModificationsDeleteIds:
        description: >
          If present, this attribute signals the deletion of certain
          entries in the "vnfcInfo" attribute array in the
          "instantiatedVnfInfo" attribute of "VnfInstance", as defined
          in clause 5.5.2.12
        type: array
        items:
          $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"

  VnfLcmOpOcc:
    description: >
@@ -365,6 +356,15 @@ definitions:
              This allows the API consumer to obtain the information contained in
              the latest "result" notification if it has not received it due to an
              error or a wrongly configured subscription filter.
              For a particular affected VL, there shall be as many "AffectedVirtualLink"
              entries as needed for signalling the different types of changes, i.e.,
              one per virtual link and change type. For instance, in the case of
              signaling affected VL instances involving the addition of a particular VL
              instance with links ports, one "AffectedVirtualLink" entry signals the
              addition of the VL by using 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".
            type: array
            items:
              $ref: "#/definitions/AffectedVirtualLink"
@@ -411,10 +411,10 @@ definitions:
          not received it due to an error or a wrongly configured subscription filter.
          Not more than one of changedInfo and modificationsTriggeredByVnfPkgChange shall be present.
        $ref: "#/definitions/ModificationsTriggeredByVnfPkgChange"
      vnfSnapshotResId:
      vnfSnapshotInfoId:
        description: >
          Identifier of the individual VNF snapshot resource, if applicable by the type of LCM operation, i.e., if value
          of operation is either "CREATE_SNAPSHOT" or "REVERT_TO_SNAPSHOT".
          Identifier of the "individual VNF snapshot" resource. Shall be present if applicable to the type of LCM operation,
          i.e., if the value of the "operation" attribute is either "CREATE_SNAPSHOT" or "REVERT_TO_SNAPSHOT".
        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
      _links:
        description: >
@@ -558,6 +558,7 @@ definitions:
    required:
      - id
      - resourceHandle
      - currentVnfExtCpData
    properties:
      id:
        description: >
@@ -576,6 +577,19 @@ definitions:
        type: array
        items:
          $ref: "#/definitions/ExtLinkPortInfo"
      currentVnfExtCpData:
        description: >
          Allows the API consumer to read the current CP configuration information for the connection of external CPs
          to the external virtual link.
          This attribute reflects the current configuration information that has resulted from merging into this attribute
          the "VnfExtCpData" information which was passed as part of the "ExtVirtualLinkData" structure in the input of
          the most recent VNF LCM operation such as "InstantiateVnfRequest", "ChangeExtVnfConnectivityRequest",
          "ChangeVnfFlavourRequest" or "ChangeCurrentVnfPkgRequest", or has been provided by the NFVO during the granting
          procedure. If applying such change results in an empty list of "currentVnfExtCpData" structure instances, the
          affected instance of "ExtVirtualLinkInfo" shall be removed from its parent data structure.
        type: array
        items:
          $ref: "SOL002SOL003_def.yaml#/definitions/VnfExtCpData"

  ExtManagedVirtualLinkInfo:
    type: object
@@ -603,7 +617,7 @@ definitions:
        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
      networkResource:
        description: >
          Reference to the VirtualNetwork resource.
          Reference to the VirtualNetwork resource providing this VL.
        $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle"
      vnfLinkPorts:
        description: >
@@ -683,7 +697,7 @@ definitions:
        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
      vnfcCpInfo:
        description: >
          CPs of the VNFC instance.
          All the CPs of the VNFC instance.
          Shall be present when that particular CP of the VNFC instance is
          associated to an external CP of the VNF instance.
          May be present otherwise.
@@ -705,20 +719,22 @@ definitions:
              $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
            vnfExtCpId:
              description: >
                When the VNFC CP is exposed as external CP of the VNF, the
                identifier of this external VNF CP.
                WhenIdentifier of the related external CP. Shall be present when the VNFC CP is exposed as an external
                instance or connected to an external CP of the VNF instance and shall be absent otherwise.
                A VNFC CP is "connected to" an external CP if the VNFC CP is connected to an internal VL that exposes
                an external CP. A VNFC CP is "exposed as" an external CP if it is connected directly to an external VL.
              $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
            cpProtocolInfo:
              description: >
                Network protocol information for this CP.
                Network protocol information for this CP. May be omitted if the VNFC CP is exposed as an external CP.
                The information can be omitted because it is already available as part of the external CP information.
              type: array
              items:
                $ref: "#/definitions/CpProtocolInfo"
            vnfLinkPortId:
              description: >
                Identifier of the "vnfLinkPorts" structure in the
                "VnfVirtualLinkResourceInfo" structure. Shall be present if
                the CP is associated to a link port.
                Identifier of the "vnfLinkPorts" structure in the "VnfVirtualLinkResourceInfo" structure. Shall be present if
                the CP is associated to a link port, on an internal VL of the VNF instance and shall be absent otherwise.
              $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
            metadata:
              description: >
@@ -1100,7 +1116,7 @@ definitions:
  AffectedVirtualLink:
    description: >
      This type provides information about added, deleted, modified and
      temporary VLs.
      temporary VLs, and added or removed VNF link ports.
    type: object
    required:
      - id
@@ -1134,6 +1150,10 @@ definitions:
          * LINK_PORT_REMOVED
          For a temporary resource, an AffectedVirtualLink structure exists as
          long as the temporary resource exists.
          When signalling the addition (LINK_PORT_ADDED) or removal (LINK_PORT_REMOVED) of VNF link ports, the
          "networkResource" attribute refers to the affected virtual link instance, not the link port instance.
          The resource handles of the affected VNF link ports can be found by dereferencing the identifiers in the
          "vnfLinkPortIds" attribute.
        type: string
        enum:
          - ADDED
@@ -1147,13 +1167,23 @@ definitions:
          Reference to the VirtualNetwork resource. Detailed information is
          (for new and modified resources) or has been (for removed
          resources) available from the VIM.
          When signalling the addition (LINK_PORT_ADDED) or removal (LINK_PORT_REMOVED) of VNF link ports, the
          "networkResource" attribute refers to the affected virtual link instance, not the link port instance.
          The resource handles of the affected VNF link ports can be found by dereferencing the identifiers in
          the "vnfLinkPortIds" attribute.
        $ref: "SOL002SOL003_def.yaml#/definitions/ResourceHandle"
      vnfLinkPortIds:
        description: >
          Identifiers of the link ports of the affected VL (reference to the vnfLinkPortInfo) related to the change.
          Shall be set when changeType is equal to "LINK_PORT_ADDED" or "LINK_PORT_REMOVED", and the related vnfLinkPort
          structures are present (case "added") or have been present (case "removed") in the VnfVirtualLinkResourceInfo
          structure that is represented by the "vnfVirtualLinkResourceInfo" attribute in the "VnfInstance" structure.
          Each identifier references a "VnfLinkPortInfo" structure.
          Shall be set when changeType is equal to "LINK_PORT_ADDED" or "LINK_PORT_REMOVED", and the related
          “VnfLinkPortInfo” structures are present (case "added") or have been present (case "removed") in the
          “VnfVirtualLinkResourceInfo” or "ExtManagedVirtualLinkInfo" structures that are represented by the
          "vnfVirtualLinkResourceInfo" or "extManagedVirtualLinkInfo" attribute in the "VnfInstance" structure.
          When signalling the addition (LINK_PORT_ADDED) or removal (LINK_PORT_REMOVED) of VNF link ports, the
          "networkResource" attribute refers to the affected virtual link instance, not the link port instance.
          The resource handles of the affected VNF link ports can be found by dereferencing the identifiers in the
          "vnfLinkPortIds" attribute.
        type: array
        items:
          $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
@@ -1322,6 +1352,7 @@ definitions:
    required:
      - id
      - cpdId
      - cpConfigId
      - cpProtocolInfo
    oneOf:
      - required:
@@ -1337,6 +1368,11 @@ definitions:
        description: >
          Identifier of the external CPD, VnfExtCpd, in the VNFD.
        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
      cpConfigId:
        description: >
          Identifier that references the applied "VnfExtCpConfig" entry in the "cpConfig" map of the "currentVnfExtCpData"
          in the "ExtVirtualLinkInfo" structure.
        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
      vnfdId:
        description: >
          Identifier of the VNFD.
@@ -1351,7 +1387,7 @@ definitions:
          $ref: "#/definitions/CpProtocolInfo"
      extLinkPortId:
        description: >
          Identifier of the "extLinkPortInfo" structure inside the "extVirtualLinkInfo" structure.
          Identifier of the "ExtLinkPortInfo" structure inside the "ExtVirtualLinkInfo" structure.
          Shall be present if the CP is associated to a link port.
        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
      metadata:
@@ -1436,9 +1472,9 @@ definitions:
      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 shall be triggered by the VNFM when there is a change
      in the state of a VNF LCM operation occurrence that changes the VNF lifecycle,
      which represents an occurrence of one the following LCM operations:
      This notification shall be triggered by the VNFM when there is a change in the state of a
      VNF LCM operation occurrence that changes the VNF lifecycle, includingwhich represents an
      occurrence of one the following LCM operations:
      * Instantiation of the VNF
      * Scaling of the VNF instance (including auto-scaling)
      * Healing of the VNF instance (including auto-healing)
@@ -1448,7 +1484,9 @@ definitions:
      * 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.
        resource
      * Creation of a VNF snapshot
      * Reversion of the VNF instance to a VNF snapshot.
      Clause 5.6.2 defines the states and state transition of a VNF LCM operation occurrence,
      and also specifies details of the notifications to be emitted at each state transition.
      If this is the initial notification about the start of a VNF LCM operation occurrence,
@@ -1567,6 +1605,14 @@ definitions:
          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.
          For a particular affected VL, there shall be as many "AffectedVirtualLink"
          entries as needed for signalling the different types of changes, i.e.,
          one per virtual link and change type. For instance, in the case of signaling
          affected VL instances involving the addition of a particular VL instance with
          links ports, one "AffectedVirtualLink" entry signals the addition of the VL by
          using 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".
        type: array
        items:
          $ref: "#/definitions/AffectedVirtualLink"
@@ -1736,10 +1782,16 @@ definitions:
      id:
        description: >
          Identifier of the VNFC instance of which the information is to be modified.
          The identifier references the "id" attribute in a "VnfcInfo" structure.
          The attribute "id" in this data type represents the same identifier as the attribute
          "vnfcInstanceId" in other related data types in the present document. For reasons of
          backward compatibility, this misalignment is not corrected.
        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
      vnfcConfigurableProperties:
        description: >
          Changes of the configurable properties of the VNFC instance.
          When this structure is part of a request, the modifications signalled in this attribute
          shall be applied according to the rules of JSON Merge Patch (see IETF RFC 7396).
        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"

  VnfcInfo:
@@ -1750,7 +1802,6 @@ definitions:
    required:
      - id
      - vduId
      - vnfcResourceInfoId
      - vnfcState
    properties:
      id:
@@ -1766,6 +1817,8 @@ definitions:
        description: >
          Identifier of the VnfcResourceInfo instance representing
          the virtualised resources used by this VNFC instance.
          Shall be present in case a corresponding VnfcResourceInfo instance exists.
          This allows to represent the error condition that a VNFC instance has lost its resources.
        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
      vnfcState:
        description: >
@@ -1800,17 +1853,23 @@ definitions:
    properties:
      vnfConfigurableProperties:
        description: >
          This attribute signals the content of the "vnfConfigurableProperties" attribute in "VnfInstance" after the
          modification and shall be present if that attribute was modified during the operation.
          This attribute signals the modifications of the "vnfConfigurableProperties" attribute in "VnfInstance" performed
          by the operation and shall be present if that attribute was modified during the operation.
          This attribute represents the delta (semantics as per IETF RFC 7386 [3], JSON Merge Patch) between the value
          of the attribute at the start of the "Change current VNF package" operation and the value of the attribute at
          its completion.
        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      metadata:
        description: >
          This attribute signals the content of the "metadata" attribute in "VnfInstance" after the modification and
          shall be present if that attribute was modified during the operation.
          This attribute signals the modifications of the "metadata" attribute in "VnfInstance" performed by the operation
          and shall be present if that attribute was modified during the operation.
          This attribute represents the delta (semantics as per IETF RFC 7386 [3], JSON Merge Patch) between the value
          of the attribute at the start of the "Change current VNF package" operation and the value of the attribute at
          its completion.
        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      extensions:
        description: >
          This attribute signals the content of the "extensions" attribute in "VnfInstance" after the modification and
          This attribute signals the modifications of the "extensions" attribute in "VnfInstance" performed by the operation and
          shall be present if that attribute was modified during the operation.
        $ref: "SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      vnfdId:
@@ -1821,22 +1880,22 @@ definitions:
        description: >
          If present, this attribute signals the new value of the "vnfProvider" attribute in "VnfInstance". If present,
          this attribute (which depends on the value of the "vnfdId" attribute) was modified implicitly during the related
          operation, by copying the value of this attribute from the VNFD in the VNF Package identified by the "vnfdId"
          attribute.
          operation, and contains a copy of  the value of he related attribute from the VNFD in the VNF Package identified
          by the "vnfdId" attribute.
        type: string
      vnfProductName:
        description: >
          If present, this attribute signals the new value of the "vnfProductName" attribute in "VnfInstance". If present,
          this attribute (which depends on the value of the "vnfdId" attribute) was modified implicitly during the related
          operation, by copying the value of this attribute from the VNFD in the VNF Package identified by the "vnfdId"
          attribute.
          operation, and contains a copy of  the value of he related attribute from the VNFD in the VNF Package identified
          by the "vnfdId" attribute.
        type: string
      vnfSoftwareVersion:
        description: >
          If present, this attribute signals the new value of the "vnfSoftwareVersion" attribute in "VnfInstance". If present,
          this attribute (which depends on the value of the "vnfdId" attribute) was modified implicitly during the related
          operation, by copying the value of this attribute from the VNFD in the VNF Package identified by the "vnfdId"
          attribute.
          operation, and contains a copy of  the value of he related attribute from the VNFD in the VNF Package identified
          by the "vnfdId" attribute.
        $ref: "SOL002SOL003_def.yaml#/definitions/Version"
      vnfdVersion:
        description: >
+22 −24

File changed.

Preview size limit exceeded, changes collapsed.