Commit ee992137 authored by Bertrand Souville's avatar Bertrand Souville
Browse files

Merge branch 'SOL002_V521_FEAT29_VNF_Power_Management' into '5.2.2'

SOL002_V521_CR166_FEAT29_VNF_Power_Management

See merge request !30
parents 59de93a8 d74333d9
Loading
Loading
Loading
Loading
Loading
+53 −8
Original line number Diff line number Diff line
@@ -160,6 +160,12 @@ definitions:
            description: >
              The state of the VNF instance.
            $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/PowerStateInfo"
          scaleStatus:
            description: >
              Scale status of the VNF, one entry per aspect. Represents for every
@@ -2438,14 +2444,16 @@ definitions:
    description: >
      This type represents request parameters for the "Scale VNF to Level" operation.

      NOTE 1:	Either the instantiationLevelId attribute or the scaleInfo attribute shall 
            be included.
      NOTE 2: If the referenced instantiationLevel or the scaleInfo attribute contain information related to VNFCs that are not
              going to be instantiated due to the selection of deployable modules, the information is stored in the VNFM for
              later use and included in the instantiatedVnfInfo. If, during the lifecycle of the VNF, as a result of a change of
              the selected deployable modules any of those VNFCs is going to be instantiated, the stored information
      NOTE 1:	Either the instantiationLevelId attribute or the scaleInfo attribute or the powerProfileId attribute shall 
            be included, but not multiple of them.
      NOTE 2: If the referenced instantiationLevel, the scaleInfo or powerProfileId attribute contain information related to VNFCs
            that are not going to be instantiated due to the selection of deployable modules, the information is stored in the 
            VNFM for later use and included in the instantiatedVnfInfo. If, during the lifecycle of the VNF, as a result of 
            a change of the selected deployable modules any of those VNFCs is going to be instantiated, the stored information
            determines the number of instances, unless the request that triggered the change also contains information
            about the number of instances.
      Editor's Note: Pending on PowerProfile work in SOL001.

    type: object
    anyOf:
      - oneOf:
@@ -2453,6 +2461,8 @@ definitions:
              - instantiationLevelId
          - required:
              - scaleInfo
          - required:
              - powerProfileId
    properties:
      instantiationLevelId:
        description: >
@@ -2468,6 +2478,13 @@ definitions:
        type: array
        items:
          $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/ScaleInfo"
      powerProfileId:
        description: >
          Identifier of the target power profile in the current deployment flavour, as
          defined in the VNFD, from which the target power state can be selected and
          be switched to.
          See notes 1 and 2.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
      additionalParams:
        description: >
          Additional parameters passed by the NFVO as input to the scaling
@@ -2964,6 +2981,34 @@ definitions:
          notification is related to. Shall be present if there is a related
          lifecycle operation occurrence.
        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink"
  PowerStateInfo:
    description: >
      This type represents information about the power state of a VNF instance.

      Editor's Note: Specification of PowerConsumptionInfo 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: "../../General_Definitions/SOL002_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.

  VnfExtCpInfo:
    description: >