Commit 2a7a98b7 authored by Sana Zulfiqar's avatar Sana Zulfiqar
Browse files

SOL002_16 & 48 added

parent 82c80017
Loading
Loading
Loading
Loading
+137 −39
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ definitions:
      - vnfProductName
      - vnfSoftwareVersion
      - vnfdVersion
      - vnfPkgInfoId
      - instantiationState
      - _links
    properties:
@@ -37,11 +36,11 @@ definitions:
          This attribute can be modified with the PATCH method.
          Modifying the value of this attribute shall not be performed 
          when conflicts exist between the previous and the newly referred 
          VNF package, i.e. when the new VNFD is not changed with respect 
          to the previous VNFD apart from referencing to other VNF software 
          images. In order to avoid misalignment of the VnfInstance with 
          the current VNF's on-boarded VNF package, the values of attributes 
          in the VnfInstance that have corresponding attributes in the VNFD 
          VNF package, i.e. when the new VNFD is changed with respect
          to the previous VNFD in other aspects than merely referencing to
          other VNF software images. In order to avoid misalignment of the
          VnfInstance with the current VNF's on-boarded VNF package, the values
          of attributes in the VnfInstance that have corresponding attributes in the VNFD
          shall be kept in sync with the values in the VNFD.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      vnfProvider:
@@ -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 
@@ -79,18 +72,14 @@ definitions:
          VNF instantiation operation (if the VNF instance is in NOT_INSTANTIATED 
          state at the time of the modification).
          Configurable properties referred in these attributes shall be declared 
          in the VNFD. 
          The declaration of configurable properties in the VNFD can optionally 
          contain the specification of initial values. 
          ETSI GS NFV-SOL 001 specifies the structure and format of the 
          VNFD based on TOSCA specifications.
          VNF configurable properties are sometimes also referred to as configuration 
          parameters applicable to a VNF. Some of these are set prior to instantiation 
          and cannot be modified if the VNF is instantiated, some are set prior to 
          instantiation (are part of initial configuration) and can be modified later, 
          and others can be set only after instantiation. The applicability of certain 
          configuration may depend on the VNF and the required operation of the VNF at 
          a certain point in time.
          in the VNFD. The declaration of configurable properties in the VNFD can optionally
          contain the specification of initial values. See note 2, note 3 and note 4.
          ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
          VNF configurable properties are sometimes also referred to as configuration parameters applicable to a VNF.
          Some of these are set prior to instantiation and cannot be modified if the VNF is instantiated, some are set
          prior to instantiation (are part of initial configuration) and can be modified later, and others can be set
          only after instantiation. The applicability of certain configuration may depend on the VNF and the required
          operation of the VNF at a certain point in time.
          These configurable properties include the following standard attributes, 
          which are declared in the VNFD if auto-scaling and/or auto-healing are 
          supported by the VNF: 
@@ -100,7 +89,17 @@ definitions:
            -	isAutohealEnabled: If present, the VNF supports auto-healing. If set 
            to true, auto-healing is currently enabled. If set to false, auto-healing 
            is currently disabled.
          This attributeThese attributes can be modified with the PATCH method.
          These configurable properties can be initialized with default values from the VNFD (see note 4).
          Configurable properties can be modified with values passed in the request structures
          of certain LCM operations, such as the InstantiateVnfRequest structure.
          Further, these configurable properties can be created, modified or deleted with the PATCH method.

          note 4: Upon creation of the VnfInstance structure, the VNFM shall create and initialize all child attributes
          of "vnfConfigurableProperties", "metadata" and "extensions" that were declared in the VNFD with a defined
          initial value. The defined initial values can be declared in the VNFD, and/or, in case of "metadata",
          obtained from the "CreateVnfRequest" structure. Child attributes of "vnfConfigurableProperties", "metadata"
          and "extensions" that have no defined initial value shall not be created, in order to be consistent with the
          semantics of the JSON Merge Patch method (see IETF RFC 7396) that interprets null values as deletion request.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      instantiationState:
        description: >
@@ -182,7 +181,7 @@ definitions:
              by the VNFCs of the VNF instance.
            type: array
            items:
              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcResourceInfo"
              $ref: "#/definitions/VnfcResourceInfo"
          virtualLinkResourceInfo:
            description: >
              Information about the virtualised network resources used by the VLs
@@ -196,6 +195,12 @@ definitions:
            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.
@@ -209,9 +214,9 @@ definitions:
          accept requests to write metadata that are not  are declared in the VNFD.  

          These attributes can be initialized with default values from VNFD and/or with values 
          passed in the CreateVnfRequest structure (see clause 5.5.2.3).
          passed in the CreateVnfRequest structure (see clause 5.4.2.3.1).

          This attribute can be modified with the PATCH method.
          These attributes can be created, modified or removed with the PATCH method.

          ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
@@ -222,23 +227,23 @@ definitions:
          These attributes represent values that are stored persistently in the VnfInstance 
          structure for consumption by the VNFM, or by the lifecycle management scripts 
          during the execution of VNF lifecycle management operations.
          All extensions that are allowed for the VNF are declared in the VNFD. The declaration of
          an extension in the VNFD contains information on whether its presence is optional or
          required, and optionally can specify an initial value. See note 2 and note 4.
          The VNFM shall reject requests to write extension attributes that are not declared in the VNFD
          with a "422 Unprocessable entity" error response as defined in clause 6.4 of ETSI GS NFV SOL 013.
        
          Modifying the values of these attributes has no direct effect on the VNF instance; 
          however, the modified attribute values can be considered during subsequent VNF 
          lifecycle management operations, which means that the modified values can indirectly 
          affect the configuration of the VNF instance.

          All extensions that are allowed for the VNF shall be declared in the VNFD.
          This attribute can be be initialized with default values from VNFD and/or 
          with values passed in the InstantiateVnfRequest structure (see clause 5.5.2.4).

          A value initialised with default values from the VNFD can be updated with values 
          passed in the InstantiateVnfRequest structure.
          These attributes can be initialized with default values from the VNFD.

          Further, these attributes can be modified with the PATCH method.
          These attributes can be modified with values passed in the request structures of certain LCM operations,
          such as the InstantiateVnfRequest structure

          ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on 
          TOSCA specifications.
          Further, these attributes can be created, modified or deleted with the PATCH method.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      _links:
        description: >
@@ -553,3 +558,96 @@ definitions:
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"


  VnfcResourceInfo:
    description: >
      This type represents the information on virtualised compute and storage
      resources used by a VNFC in a VNF instance.
    type: object
    required:
      - id
      - vduId
      - computeResource
    properties:
      id:
        description: >
          Identifier of this VnfcResourceInfo instance.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
      vduId:
        description: >
          Reference to the applicable VDU in the VNFD.
          ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
      computeResource:
        description: >
          Reference to the VirtualCompute resource.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
      storageResourceIds:
        description: >
          References to the VirtualStorage resources. The value refers to a
          VirtualStorageResourceInfo item in the VnfInstance.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
      reservationId:
        description: >
          The reservation identifier applicable to the resource. It shall be
          present when an applicable reservation exists.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      vnfcCpInfo:
        description: >
          All CPs of the VNFC instance.
        type: array
        items:
          type: object
          required:
            - id
            - cpdId
          properties:
            id:
              description: >
                Identifier of this VNFC CP instance and the associated array
                entry.
              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
            cpdId:
              description: >
                Identifier of the VDU CPD, cpdId, in the VNFD.
                ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
            vnfExtCpId:
              description: >
                Identifier of the related external CP. Shall be present when the VNFC CP is exposed
                as an external CP of the VNF instance or connected to an external CP of the VNF instance
                (see note 2) and shall be absent otherwise.

                NOTE 2:	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: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
            cpProtocolInfo:
              description: >
                Network protocol information for this CP.
                May be omitted if the VNFC CP is exposed as an external CP. See note 3.

                NOTE 3:	The information can be omitted because it is already available as part of the external
                CP information.
              type: array
              items:
                $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/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
                on an internal VL of the VNF instance and shall be absent otherwise.
              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
            metadata:
              description: >
                Metadata about this CP.
              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      metadata:
        description: >
          Metadata about this resource.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"