Commit 60bbf159 authored by Muhammad Hamza's avatar Muhammad Hamza
Browse files

update/add attributes in SOL003 VNF LCM

parent 1bdc90f8
Loading
Loading
Loading
Loading
Loading
+92 −26
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ definitions:
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"

  ChangeExtVnfConnectivityRequest:
    #SOL003 location: 5.5.2.11
    description: >
      This type represents request parameters for the
      "Change external VNF connectivity" operation to modify the external
@@ -433,10 +432,17 @@ definitions:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ExtVirtualLinkData"
      vimConnectionInfo:
        description: >
          Information about VIM connections to be used for managing the resources for the VNF instance, or refer to 
          external virtual links. This attribute shall only be supported and may be present if VNF-related resource 
          management in direct mode is applicable. The VNFM shall apply the content of this attribute to the 
          "vimConnectionInfo" attribute of "VnfInstance" according to the rules of JSON Merge Patch (see IETF RFC 7396).
          Information about VIM or CISM connections to be used for managing the resources for the VNF instance, or
          refer to external virtual links.
          This attribute shall only be supported and may be present if
            - the resources for at least one of the VNFCs
              shall be managed by a VIM and VNF-related
              resource management in direct mode is
              applicable.
            - the resources for at least one of the VNFCs
              shall be managed by a CISM.
          The VNFM shall apply the content of this attribute to the "vimConnectionInfo" attribute of "VnfInstance"
          according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]).
        type: object
        additionalProperties:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo"
@@ -444,7 +450,7 @@ definitions:
        description: >
          Additional input parameters for the instantiation process, specific
          to the VNF being instantiated, as declared in the VNFD as part of
          "ChangeExtVnfConnectivityOpConfig".".
          "ChangeExtVnfConnectivityOpConfig" defined in ETSI GS NFV-IFA 011 [10].
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"

  ChangeCurrentVnfPkgRequest:
@@ -495,10 +501,14 @@ definitions:
          $ref: "#/definitions/ExtManagedVirtualLinkData"
      vimConnectionInfo:
        description: >
          Information about VIM connections to be used for managing the resources for the VNF instance, or refer to 
          external virtual links. This attribute shall only be supported and may be present if VNF-related resource 
          management in direct mode is applicable. The VNFM shall apply the content of this attribute to the 
          "vimConnectionInfo" attribute of "VnfInstance" according to the rules of JSON Merge Patch (see IETF RFC 7396).
          Information about VIM or CISM connections to be used for managing the resources for the VNF
          instance, or refer to external virtual links.
          This attribute shall only be supported and may be present if
            - the resources for at least one of the VNFCs shall be managed by a VIM and
            VNF-related resource management in direct mode is applicable.
            - the resources for at least one of the VNFCs shall be managed by a CISM.
            The VNFM shall apply the content of this attribute to the "vimConnectionInfo" attribute of
          "VnfInstance" according to the rules of JSON Merge Patch (see IETF RFC 7396 [5]).
        type: object
        additionalProperties:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo"
@@ -506,7 +516,7 @@ definitions:
        description: >
          Additional parameters passed by the NFVO as input to the process, specific 
          to the VNF of which the underlying VNF package is changed, as declared in 
          the VNFD as part of "ChangeCurrentVnfPkgOpConfig".
          the VNFD as part of "ChangeCurrentVnfPkgOpConfig" " defined in ETSI GS NFV-IFA 011 [10].
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      extensions:
        description: >
@@ -682,7 +692,7 @@ definitions:
        description: >
          Additional input parameters for the snapshot creation process, specific 
          for the VNF being “snapshotted”, as declared in the VNFD as part of
          “CreateSnapshotVnfOpConfig”.
          “CreateSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [10].
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
      userDefinedData:
        description: >
@@ -724,7 +734,7 @@ definitions:
      additionalParams:
        description: >
          Additional input parameters for the revert to VNF snapshot process, specific for the VNF being 
          “reverted”, as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig”.
          “reverted”, as declared in the VNFD as part of “RevertToSnapshotVnfOpConfig” defined in ETSI GS NFV-IFA 011 [10].
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"

  VnfSnapshotInfoModificationRequest:
@@ -1215,6 +1225,13 @@ definitions:
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfLinkPortInfo"
      vnfNetAttDefResource:
        description: >
          Network attachment definition resources that provide the specification of the interface to attach connection
          points to this VL.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo"
      extManagedMultisiteVirtualLinkId:
        description: >
          Identifier of the externally-managed multi-site VL instance. The identifier is assigned by the NFVMANO entity
@@ -1255,7 +1272,7 @@ definitions:
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      storageResource:
        description: >
          Reference to the VirtualStorage resource.
          Reference to the VirtualStorage resource or reference to a Storage MCIO.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
      zoneId:
        description: >
@@ -1276,9 +1293,15 @@ definitions:

  VnfcResourceInfo:
    description: >
      This type represents the information on virtualised compute and storage resources 
      used by a VNFC in a VNF instance. It shall comply with the provisions defined in 
      table 5.5.3.5-1.
      This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.
      Depending on the form of virtualisation container of the VNFC:
        - For a VNFC based on VM, a reference to the corresponding VirtualCompute shall be provided, and
        - For a VNFC based on OS container(s), a reference to the Compute MCIO shall be provided. Hence, exposure of
          information by the VNFM to the NFVO is at the MCIO level.
      In addition, the references to the storage resources depend on the form of the VNFC:
        a) For a VNFC based on VM, storage resource identifiers shall refer to VirtualStorage resources, and
        b) For a VNFC based on OS container(s), storage resource identifiers shall refer to Storage MCIOs.
      It shall comply with the provisions defined in table 5.5.3.5-1.

      NOTE 1:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on 
              TOSCA specifications.
@@ -1291,6 +1314,10 @@ definitions:
              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.
      NOTE 5: Cardinality greater than 1 is only applicable for specific cases where more than one network attachment
              definition resource is needed to fulfil the connectivity requirements of the internal CP, e.g. to build a link
              redundant mated pair in SR-IOV cases.
      NOTE 6: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.
    type: object
    required:
      - id
@@ -1313,7 +1340,7 @@ definitions:
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      computeResource:
        description: >
          Reference to the VirtualCompute resource.
          Reference to the VirtualCompute resource or reference to a Compute MCIO.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
      zoneId:
        description: >
@@ -1324,8 +1351,8 @@ definitions:
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      storageResourceIds:
        description: >
          References to the VirtualStorage resources. The value refers to a
          VirtualStorageResourceInfo item in the VnfInstance.
          References to the VirtualStorage resources or references to Storage MCIOs.
          The value refers to a VirtualStorageResourceInfo item in the VnfInstance.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
@@ -1384,9 +1411,17 @@ definitions:
          Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP
          instance participates in.  Shall be provided if the present CP instance participates in a trunk as subport, and
          the referred VNFC CP instances are also present in the vnfcCpInfo attribute.

        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
      
      netAttDefResourceInfoId:
        description: >
          Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the
          connection point to a secondary container cluster network. See notes 5 and 6.
          It shall be present if the internal CP is associated to a VNFC realized by one or a set of OS containers and is
          connected to a secondary container cluster network. It shall not be present otherwise.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"

      metadata:
        description: >
@@ -1636,7 +1671,7 @@ definitions:
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      networkResource:
        description: >
          Reference to the VirtualNetwork resource.
          Reference to the VirtualNetwork resource or reference to a Network MCIO.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
      zoneId:
        description: >
@@ -2327,7 +2362,18 @@ definitions:
        items:
          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVipCp"
      

      affectedVirtualCps:
        description:
          Information about virtual CP instances that were affected during the execution of the lifecycle
          management operation, if this notification represents the result of a lifecycle management operation
          occurrence.
          Shall be present if the "notificationStatus" is set to "RESULT", the "verbosity" attribute is set to "FULL"
          and the operation has made any changes to the virtual CP instances of the VNF instance. Shall be absent
          otherwise. Only information about virtual CP instances that have been added, deleted or modified shall be
          provided.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVirtualCp"
      changedExtConnectivity:
        description: >
          Information about changed external connectivity, if this notification
@@ -2551,3 +2597,23 @@ definitions:
          internal CP created from the CPD identified by cpdId to a
          secondary container cluster network. See note.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"

  VirtualCpAddressInfo:
    description: >
      This type represents information about a network address that has been assigned to a virtual CP.
    type: object
    required:
      - type
    properties:
      type:
        description: >
          The type of the IP addresses.
          Permitted values: IPV4, IPV6.
        type: string
        enum:
          - IPV4
          - IPV6
      loadBalancerIp:
        description: >
          Fixed addresses assigned to an external load balancer.
        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
 No newline at end of file
+7 −0
Original line number Diff line number Diff line
@@ -302,6 +302,13 @@ definitions:
        type: array
        items:
          $ref: "SOL002SOL003_def.yaml#/definitions/VnfExtCpData"
      extNetAttDefResourceData:
        description: >
          Network attachment definition resources that provide the specification of the interface to attach connection
          points to this VL.
        type: array
        items:
          $ref: "SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/NetAttDefResourceInfo"

  VnfLinkPortInfo:
    description: >