diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml index b64944eb43a21779d10c2f195f1d9f3148e550f8..6771125285977149527826a8a708a20b5d361f80 100644 --- a/src/SOL002/General_Definitions/SOL002_def.yaml +++ b/src/SOL002/General_Definitions/SOL002_def.yaml @@ -784,8 +784,6 @@ definitions: to the same namespace as defined by the corresponding "containerNamespace" attribute in the "resourceHandle" attribute in the "NetAttDefResourceData". * NOTE 4: 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. anyOf: - required: - linkPortId @@ -839,6 +837,7 @@ definitions: "SecurityGroupRule" specified in the VNFD as part of this attribute, the VNFM shall use the configuration as specified in the VNFD. + $ref: "#/definitions/CpSecurityGroupData" netAttDefResourceId: description: > Identifier of the “NetAttDefResourceData” structure that @@ -900,6 +899,36 @@ definitions: the fully qualified domain names. type: string + 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/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 + IpOverEthernetAddressData: description: > This type represents network address data for IP over Ethernet. diff --git a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml index f5f6fa43360d61fcc68f99119bfa87f8c72160e6..5d5c7c8d4bab7ce9a602114527ab2ffdd9516c4f 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml @@ -2452,7 +2452,6 @@ definitions: 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: @@ -2787,6 +2786,50 @@ definitions: items: type: string + 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: "../../General_Definitions/SOL002_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 + IpOverEthernetAddressInfo: description: > This type represents information about a network address that has been assigned. @@ -2985,8 +3028,6 @@ definitions: 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 @@ -3009,6 +3050,30 @@ definitions: 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/PowerConsumptionInfo" + + PowerConsumptionInfo: + 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 VnfExtCpInfo: description: > @@ -3022,8 +3087,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 @@ -3116,7 +3179,7 @@ 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" CertificateInfo: description: > This type provides input information related to certificate and certificate management.