Merge branch 'SOL003_V522_FEAT29_FEAT21_Addressing_ENs' into '5.2.3' (96e7ce68) · Commits · NFV - Network Functions Virtualisation / SOL002-SOL003

src/SOL003/General_Definitions/SOL003_def.yaml

+31 −2

Original line number	Diff line number	Diff line
		@@ -442,8 +442,6 @@ definitions:
		to the same namespace as defined by the corresponding "containerNamespace" attribute in the "resourceHandle" a 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
		@@ -512,6 +510,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"

		CpProtocolData:
		description: >
		@@ -564,6 +563,36 @@ definitions:
		items:
		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.

src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml

+69 −5

Original line number	Diff line number	Diff line
		@@ -3430,7 +3430,6 @@ definitions:
		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:
		@@ -3765,6 +3764,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/SOL003_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.
		@@ -3965,8 +4008,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
		@@ -3989,6 +4030,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: >
		@@ -4002,8 +4067,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
		@@ -4098,6 +4161,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"
		VnfOperationalStateType:
		description: >
		STARTED: The VNF instance is up and running.