Commit 413f27c3 authored by Bertrand Souville's avatar Bertrand Souville
Browse files

Merge branch 'SOL005_V521_FEAT29_VNF_Power_Management' into '5.2.3'

SOL005_V521_CR167_FEAT29_VNF_Power_Management

See merge request !29
parents 0326ff1b 3d147cbb
Loading
Loading
Loading
Loading
Loading
+53 −8
Original line number Original line Diff line number Diff line
@@ -1104,6 +1104,12 @@ definitions:
            description: >
            description: >
              State of the VNF instance.
              State of the VNF instance.
            $ref: "#/definitions/VnfOperationalStateType"
            $ref: "#/definitions/VnfOperationalStateType"
          vnfPowerState:
            description: >
              The power state of the VNF instance. Only present if the VNF instance is in a power
              state or a scale status (refer to attribute "scaLeStatus" that has an associated
              power profile, as defined in the VNFD.
            $ref: "#/definitions/VnfPowerStateInfo"
          scaleStatus:
          scaleStatus:
            description: >
            description: >
              Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how "big"
              Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how "big"
@@ -1482,6 +1488,31 @@ definitions:
    enum:
    enum:
      - STARTED
      - STARTED
      - STOPPED
      - STOPPED
  VnfPowerStateInfo:
    description: >
      This type represents information about the power state of a VNF instance.
      Editor's Note: Specification of VnfPowerConsumptionInfo data type is FFS pending
                     on PowerProfile work in SOL001.
    type: object
    required:
      - powerProfileId
      - name
    properties:
      powerProfileId:
        description: >
          Identifier of the power profile, as defined in the VNFD, applied to the VNF instance.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      name:
        description: >
          Name of the power profile as provided in the VNFD
        type: string
      powerConsumptionInfo:
        description: >
          Estimated power consumption information of the resources associated
          with this power profile, as provided in the VNFD. VNFM exposes and 
          can use this information to control the VNF instance to operate according
          to the power profile and selected power state, e.g., monitoring actual energy
          or power consumption of the VNF instance and compare against the estimated one.


  VnfScaleInfo:
  VnfScaleInfo:
    required:
    required:
@@ -3687,7 +3718,8 @@ definitions:
        $ref: "#/definitions/ScaleNsData"
        $ref: "#/definitions/ScaleNsData"
      scaleVnfData:
      scaleVnfData:
        description: >
        description: >
          The necessary information to scale the referenced NS instance.
          The necessary information to scale or to change to a power profile
          a given VNF instance that is part of the referenced NS instance.
          It shall be present when scaleType = SCALE_VNF.
          It shall be present when scaleType = SCALE_VNF.
          See note.
          See note.
        type: array
        type: array
@@ -6197,20 +6229,27 @@ definitions:
    description: >
    description: >
      This type describes the information used to scale a VNF instance to a target size. The target size is either expressed as
      This type describes the information used to scale a VNF instance to a target size. The target size is either expressed as
      an instantiation level of that DF as defined in the VNFD, or given as a list of scale levels, one per scaling aspect of that
      an instantiation level of that DF as defined in the VNFD, or given as a list of scale levels, one per scaling aspect of that
      DF. Instantiation levels and scaling aspects are declared in the VNFD. The NFVO shall then invoke the
      DF. Instantiation levels and scaling aspects are declared in the VNFD. 
      ScaleVnfToLevel operation towards the appropriate VNFM.
      This type also describes the information needed to scale an instantiated VNF of a particular DF to a power profile for
      
      the VNF instance. This can be done either by referring to a defined instantiation level or list of scale levels defined in
      NOTE 1: Either the vnfInstantiationLevelId attribute or the vnfScaleInfo attribute shall be included.
      the VNFD (see above) that have an associated power profile or to a specified power profile in the VNFD.
      NOTE 2: If the referenced instantiationLevel or the scaleInfo attribute contain information related to VNFCs that are not
      The NFVO shall then invoke the ScaleVnfToLevel operation towards the appropriate VNFM.
              going to be instantiated due to the selection of deployable modules, when passed to the VNFM, the information
      
              is stored in the VNFM for later use and included in the instantiatedVnfInfo, as described in clause 5.5.2.6 of
      NOTE 1: Either the vnfInstantiationLevelId attribute or the vnfScaleInfo or the vnfPowerProfileId attribute shall be 
              ETSI GS NFV-SOL 003.
              included, but not multiple of them.
      NOTE 2: If the referenced instantiationLevel, the scaleInfo or the vnfPowerProfileId attribute contain information related 
              to VNFCs that are not going to be instantiated due to the selection of deployable modules, when passed to the VNFM, 
              the information is stored in the VNFM for later use and included in the instantiatedVnfInfo, as described in 
              clause 5.5.2.6 of ETSI GS NFV-SOL 003.
      Editor's Note: Pending on PowerProfile work in SOL001.
    type: object
    type: object
    anyOf:
    anyOf:
      - required:
      - required:
          - vnfInstantiationLevelId
          - vnfInstantiationLevelId
      - required:
      - required:
          - vnfScaleInfo
          - vnfScaleInfo
      - required:
          - vnfPowerProfileId
    properties:
    properties:
      vnfInstantiationLevelId:
      vnfInstantiationLevelId:
        description: >
        description: >
@@ -6225,6 +6264,12 @@ definitions:
        type: array
        type: array
        items:
        items:
          $ref: "#/definitions/VnfScaleInfo"
          $ref: "#/definitions/VnfScaleInfo"
      vnfPowerProfileId:
        description: >
          Identifier of the target power profile in the current DF, as defined in the VNFD,
          from which the target power state can be selected and be switched to. 
          See notes 1 and 2.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      additionalParams:
      additionalParams:
        description: >
        description: >
          Additional parameters passed by the NFVO as input to
          Additional parameters passed by the NFVO as input to