Merge branch 'SOL005_V521_FEAT21_Security_Groups' into '5.2.3' (ce08908e) · Commits · NFV - Network Functions Virtualisation / SOL005

src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml

+54 −34

Original line number	Original line	Diff line number	Diff line
	@@ -1922,15 +1922,16 @@ definitions:
	description: >		description: >
	This type represents information about an external CP of a VNF. It shall comply		This type represents information about an external CP of a VNF. It shall comply
	with the provisions defined in Table 6.5.3.70-1.		with the provisions defined in Table 6.5.3.70-1.
	NOTE 1: The attributes attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and		* NOTE 1: The attributes attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and
	"associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.		"associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.
	NOTE 2: An external CP instance is not associated to a link		* NOTE 2: An external CP instance is not associated to a link
	port in the cases indicated for the “extLinkPorts” attribute in clause 6.5.3.26.		port in the cases indicated for the “extLinkPorts” attribute in clause 6.5.3.26.
	NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network		* NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network
	attachment definition resource is needed to fulfil the connectivity requirements of the external CP,		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.		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.		* 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		type: object
	required:		required:
	- id		- id
	@@ -2029,6 +2030,10 @@ definitions:
	type: array		type: array
	items:		items:
	$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"		$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
			cpSecurityGroupInfo:
			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.

	CpGroupInfo:		CpGroupInfo:
	description: >		description: >
	@@ -7292,7 +7297,7 @@ definitions:
	shall use the network attachment definition resource of secondary container cluster		shall use the network attachment definition resource of secondary container cluster
	network when connecting the CP to the external VL.		network when connecting the CP to the external VL.

	NOTE 1: The following conditions apply to the attributes "linkPortId" and "cpProtocolData"		* NOTE 1: The following conditions apply to the attributes "linkPortId" and "cpProtocolData"
	for an external CP instance connected or to be connected to a virtual network not		for an external CP instance connected or to be connected to a virtual network not
	categorized as secondary container cluster network:		categorized as secondary container cluster network:
	- At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for		- At least one of the "linkPortId" and "cpProtocolData" attributes shall be present for
	@@ -7304,20 +7309,23 @@ definitions:
	referencing a pre-created link port with pre-configured address information.		referencing a pre-created link port with pre-configured address information.
	- If both "cpProtocolData" and "linkportId" are provided, the API consumer shall ensure that		- If both "cpProtocolData" and "linkportId" are provided, the API consumer shall ensure that
	the cpProtocolData can be used with the pre-created link port referenced by "linkPortId".		the cpProtocolData can be used with the pre-created link port referenced by "linkPortId".
	NOTE 2: In case the NFVO manages its own identifier space, the NFVO may remap this identifier		* NOTE 2: In case the NFVO manages its own identifier space, the NFVO may remap this identifier
	when communicating with the VNFM. If the NFVO knows that there can be an identifier collision		when communicating with the VNFM. If the NFVO knows that there can be an identifier collision
	when communicating with the VNFM by using the identifier from the OSS/BSS, the NFVO shall remap it.		when communicating with the VNFM by using the identifier from the OSS/BSS, the NFVO shall remap it.
	NOTE 3: The following conditions apply to the attributes "netAttDefResourceId" and "cpProtocolData" for an external CP		* NOTE 3: The following conditions apply to the attributes "netAttDefResourceId" and "cpProtocolData" for an external CP
	instance connected or to be connected to a secondary container cluster network:		instance connected or to be connected to a secondary container cluster network:
	− Void.		− Void.
	− At least one of these attributes shall be present for a to-be-created external CP instance or an existing		− At least one of these attributes shall be present for a to-be-created external CP instance or an existing
	external CP instance.		external CP instance.
	NOTE 4: Cardinality greater than 1 is only applicable for specific cases where more than one network		* NOTE 4: Cardinality greater than 1 is only applicable for specific cases where more than one network
	attachment definition resource is needed to fulfil the connectivity requirements of the external CP,		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. When more than one "netAttDefResourceId"		e.g. to build a link redundant mated pair in SR-IOV cases. When more than one "netAttDefResourceId"
	is indicated, all shall belong to the same namespace as defined by the corresponding		is indicated, all shall belong to the same namespace as defined by the corresponding
	"containerNamespace" attribute in the "resourceHandle" attribute in the "NetAttDefResourceData".		"containerNamespace" attribute in the "resourceHandle" attribute in the "NetAttDefResourceData".
	NOTE 5: Either "linkPortId" or "netAttDefResourceId" may be included, but not both.		* 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		type: object
	oneOf:		oneOf:
	- required:		- required:
	@@ -7366,6 +7374,18 @@ definitions:
	type: array		type: array
	items:		items:
	$ref: "#/definitions/IdentifierInVnf"		$ref: "#/definitions/IdentifierInVnf"
			cpSecurityGroupData:
			description: >
			Parameters for modifying and overriding security groups
			information bound to this CP. 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 overridden such as "portRangeMin" and "portRangeMax".
			If no security group configuration is provided for a given
			"SecurityGroupRule" specified in the VNFD as part of this
			attribute, the VNFM will use the configuration as specified
			in the VNFD.

	IdentifierInNs:		IdentifierInNs:
	description: >		description: >

Admin message