Commit 0f5cd8e9 authored by Bertrand Souville's avatar Bertrand Souville
Browse files

Merge branch 'SOL005_V523_FEAT29_FEAT21_Addressing_ENs' into '5.2.4'

SOL005_V523_CR_248_FEAT29_FEAT21_Addressing_ENs

See merge request !32
parents 6c7218a5 61ead453
Loading
Loading
Loading
Loading
Loading
+101 −7
Original line number Diff line number Diff line
@@ -1491,8 +1491,6 @@ definitions:
  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
@@ -1513,6 +1511,30 @@ definitions:
          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.
        $ref: "#/definitions/VnfPowerConsumptionInfo"

  VnfPowerConsumptionInfo:
    description: >
      This type represents information about estimated power consumption of the resources
      associated with the power profile, as provided in the VNFD.
    type: object
    required:
      - minPowerConsumption
      - maxPowerConsumption
      - averagePowerConsumption
    properties:
      minPowerConsumption:
         description: >
           Minimum power consumption of this power profile. Unit is KW/h.
         type: integer
      maxPowerConsumption:
         description: >
           Maximum power consumption of this power profile. Unit is KW/h.
         type: integer
      averagePowerConsumption:
         description: >
           Average power consumption of this power profile. Unit is KW/h.
         type: integer

  VnfScaleInfo:
    required:
@@ -1930,8 +1952,6 @@ definitions:
                attachment definition resource is needed to fulfil the connectivity requirements of the external CP,
                e.g. to build a link redundant mated pair in SR-IOV cases.
      * NOTE 4: When more than one "netAttDefResourceId" is indicated, all shall belong to the same namespace.
      * Editor's Note: Specification of CpSecurityGroupInfo data type is FFS due to dependency on SOL001/
                       descriptor work.
    type: object
    required:
      - id
@@ -2034,6 +2054,52 @@ definitions:
        description: >
          List of active security group rules applied to this external CP instance. The attribute identifies which
          "SecurityGroupRule" specified in the VNFD are activated and the values of its attributes.
        $ref: "#/definitions/CpSecurityGroupInfo"
  
  CpSecurityGroupInfo:
    description: >
      This type provides the list of active security group rules applied to an external CP instance.
      The type identifies which "SecurityGroupRule" specified in the VNFD are activated and the values
      of its attributes.
    type: object
    required:
      - securityGroupRuleId
      - etherType
      - protocol
      - portRangeMin
      - portRangeMax
    properties:
      securityGroupRuleId:
        description: >
          Identifier of the security group rule policy in the VNFD.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      description:
        description: >
          Human readable description of the security group rule.
        type: string
      etherType:
        description: >
          Indicates the protocol carried over the Ethernet layer.
          Permitted values: IPV4, IPV6.
        type: string
        enum:
          - IPV4
          - IPV6
      protocol:
        description: >
          Indicates the protocol carried over the IP layer.
          Permitted values: any protocol defined in the IANA protocol
          registry (refer to clause 9.10.1.2 ofd ETSI GS NFV-SOL 001 for further information).
        type: string
      portRangeMin:
        description: >
          Value for the minimum port number in the range that is matched by the security group rule.
        type: integer
      portRangeMax:
        description: >
          Value for the maximum port number in the range that is matched by the security group rule.
        type: integer


  CpGroupInfo:
    description: >
@@ -6246,7 +6312,6 @@ definitions:
              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
    anyOf:
      - required:
@@ -7323,8 +7388,6 @@ definitions:
                is indicated, all shall belong to the same namespace as defined by the corresponding 
                "containerNamespace" attribute in the "resourceHandle" attribute in the "NetAttDefResourceData".
      * NOTE 5: Either "linkPortId" or "netAttDefResourceId" may be included, but not both.
      * Editor's Note: Specification of CpSecurityGroupData data type is FFS
                       due to dependency on SOL001/descriptor work.

    type: object
    oneOf:
@@ -7386,6 +7449,37 @@ definitions:
          "SecurityGroupRule" specified in the VNFD as part of this
          attribute, the VNFM will use the configuration as specified
          in the VNFD.
        $ref: "#/definitions/CpSecurityGroupData"
  
  CpSecurityGroupData:
    description: >
      This type provides input parameters for modifying and overriding security groups.
      The parameters identify which "SecurityGroupRule" specified in the VNFD is activated/deactivated
      and for an activated security group rule the values of attributes defined in the VNFD that can be
      overriden such as "portRangeMin" and "portRangeMax".
    type: object
    required:
      - securityGroupRuleId
    properties:
      securityGroupRuleId:
        description: >
          Identifier of the security group rule policy in the VNFD.
        $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
      isActivated:
        description: >
          Indicates whether the rule is to be active (true) or inactive (false). If no attribute value
          is provided, the Security Group Rule is activated by default.
        type: boolean
      portRangeMin:
        description: >
          Value for the minimum port number in the range that is matched by the security group rule.
          The value shall be within the range "0 - 65535".
        type: integer
      portRangeMax:
        description: >
          Value for the maximum port number in the range that is matched by the security group rule.
          The value shall be within the range "0 - 65535".
        type: integer

  IdentifierInNs:
    description: >