update ReourceHandle attribute referncing in SOL002 (4713c124) · Commits · NFV - Network Functions Virtualisation / SOL002-SOL003

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

+11 −73

Original line number	Original line	Diff line number	Diff line
	@@ -991,7 +991,7 @@ definitions:
	computeSnapshotResource:		computeSnapshotResource:
	description: >		description: >
	Reference to a compute snapshot resource. See note 1.		Reference to a compute snapshot resource. See note 1.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	storageSnapshotResources:		storageSnapshotResources:
	description: >		description: >
	Mapping of the storage resources associated to the VNFC with the storage snapshot resources.		Mapping of the storage resources associated to the VNFC with the storage snapshot resources.
	@@ -1008,7 +1008,7 @@ definitions:
	storageSnapshotResource:		storageSnapshotResource:
	description: >		description: >
	Reference to a storage snapshot resource. See note 2.		Reference to a storage snapshot resource. See note 2.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	userDefinedData:		userDefinedData:
	description: >		description: >
	User defined data for the VNF snapshot.		User defined data for the VNF snapshot.
	@@ -1096,7 +1096,7 @@ definitions:
	networkResource:		networkResource:
	description: >		description: >
	Reference to the VirtualNetwork resource providing this VL.		Reference to the VirtualNetwork resource providing this VL.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	vnfLinkPorts:		vnfLinkPorts:
	description: >		description: >
	Link ports of this VL.		Link ports of this VL.
	@@ -1160,7 +1160,7 @@ definitions:
	computeResource:		computeResource:
	description: >		description: >
	Reference to the VirtualCompute resource or reference to a Compute MCIO.		Reference to the VirtualCompute resource or reference to a Compute MCIO.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	storageResourceIds:		storageResourceIds:
	description: >		description: >
	References to the VirtualStorage resources or references to Storage MCIO(s).		References to the VirtualStorage resources or references to Storage MCIO(s).
	@@ -1268,7 +1268,7 @@ definitions:
	networkResource:		networkResource:
	description: >		description: >
	Reference to the VirtualNetwork resource or reference to a Network MCIO.		Reference to the VirtualNetwork resource or reference to a Network MCIO.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	reservationId:		reservationId:
	description: >		description: >
	The reservation identifier applicable to the resource. It shall be		The reservation identifier applicable to the resource. It shall be
	@@ -1320,7 +1320,7 @@ definitions:
	storageResource:		storageResource:
	description: >		description: >
	Reference to the VirtualStorage resource or reference to a Storage MCIO.		Reference to the VirtualStorage resource or reference to a Storage MCIO.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	reservationId:		reservationId:
	description: >		description: >
	The reservation identifier applicable to the resource. It shall be		The reservation identifier applicable to the resource. It shall be
	@@ -1377,7 +1377,7 @@ definitions:
	Reference to the VirtualCompute resource. Detailed information is		Reference to the VirtualCompute resource. Detailed information is
	(for new and modified resources) or has been (for removed		(for new and modified resources) or has been (for removed
	resources) available from the VIM.		resources) available from the VIM.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	metadata:		metadata:
	description: >		description: >
	Metadata about this resource.		Metadata about this resource.
	@@ -1474,7 +1474,7 @@ definitions:
	Reference to the VirtualNetwork resource. Detailed information is		Reference to the VirtualNetwork resource. Detailed information is
	(for new and modified resources) or has been (for removed		(for new and modified resources) or has been (for removed
	resources) available from the VIM. See note.		resources) available from the VIM. See note.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	vnfLinkPortIds:		vnfLinkPortIds:
	description: >		description: >
	Identifiers of the link ports of the affected VL related to the change. Each identifier references a		Identifiers of the link ports of the affected VL related to the change. Each identifier references a
	@@ -1542,7 +1542,7 @@ definitions:
	Reference to the VirtualStorage resource. Detailed information is		Reference to the VirtualStorage resource. Detailed information is
	(for new and modified resources) or has been (for removed		(for new and modified resources) or has been (for removed
	resources) available from the VIM.		resources) available from the VIM.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
	metadata:		metadata:
	description: >		description: >
	Metadata about this resource.		Metadata about this resource.
	@@ -1908,7 +1908,7 @@ definitions:
	description: >		description: >
	Reference to the link port resource.		Reference to the link port resource.
	Detailed information is (for added resources) or has been (for removed resources) available from the VIM.		Detailed information is (for added resources) or has been (for removed resources) available from the VIM.
	$ref: "#/definitions/ResourceHandle"		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"

	VnfInfoModifications:		VnfInfoModifications:
	description: >		description: >
	@@ -1985,65 +1985,3 @@ definitions:
	type: array		type: array
	items:		items:
	$ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications"		$ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcInfoModifications"
			No newline at end of file

	ResourceHandle:
	required:
	- resourceId
	type: object
	description: >
	This type represents the information that allows addressing a virtualised
	resource that is used by a VNF instance. Information about the resource
	is available from the VIM.

	* NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is known to the
	VNFM. Moreover, the identifier of the VIM connection provides scope to the resourceId

	* NOTE 2: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM or CISM or the
	resource provider and can be used as information that complements the ResourceHandle. When the
	container infrastructure service is a Kubernetes® instance the vimLevelResourceType is the type of
	resource, as would correspond to the ‘kind’ field if the resource is declared in its own Kubernetes®
	manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition.

	* NOTE 3: When the container infrastructure service is a Kubernetes® instance the resourceId shall be populated
	in the following way:
	- For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster
	wide per resource type.
	- For a storage MCIO modelled as a persistent volume claim, it is the name of the persistent volume claim,
	i.e. the value of the ‘claimName’ field in the Kubernetes® manifest, or a compound name built by Kubernetes®
	if the persistent volume claim is defined inline in another template instead of in its own manifest.
	- For a network MCIO representing a NetworkAttachmentDefinition, a Service or an Ingress, it is the value of
	the ‘metadata.name’ field in Kubernetes® manifest.
	properties:
	vimConnectionId:
	description: >
	Identifier of the VIM or CISM connection to manage the resource.
	This attribute shall be supported when the resource is managed by a CISM.
	When the resource is managed by a VIM, this attribute shall only be supported and present if VNF--related
	resource management in direct mode is applicable.
	See note 1.

	$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
	resourceProviderId:
	description: >
	Identifier of the entity responsible for the management of the resource.
	This attribute shall only be supported and present when VNF-related resource management in indirect mode is applicable. The
	identification scheme is outside the scope of the present document.
	$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
	resourceId:
	description: >
	Identifier of the resource in the scope of the VIM or the CISM or the resource provider. See note 3.
	$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVim"
	vimLevelResourceType:
	description: >
	Type of the resource in the scope of the VIM or the CISM or the resource provider. See note 2.
	type: string
	vimLevelAdditionalResourceInfo:
	descriptions: >
	Additional resource information which is specific to this resource and its type, and which is available
	from the VIM or the CISM or the resource provider.
	$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/AdditionalResourceInfo"
	containerNamespace:
	description: >
	The value of the namespace in which the MCIO corresponding to the resource is deployed.
	This attribute shall be present if the resource is managed by a CISM and it shall be absent otherwise.
	type: string
	No newline at end of file

src/definitions/SOL002SOL003_def.yaml

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -279,7 +279,11 @@ definitions:
	resource that is used by a VNF instance. Information about the resource		resource that is used by a VNF instance. Information about the resource
	is available from the VIM.		is available from the VIM.

	* NOTE 1: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM		* NOTE 1: The information about the VIM or CISM connection referenced by the VIM connection id is
			known to the VNFM. Moreover, the identifier of the VIM connection provides scope to the
			resourceId. (This applies in case of SOL002)

			* NOTE 2: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM
	or CISM or the resource provider and can be used as information that complements the		or CISM or the resource provider and can be used as information that complements the
	ResourceHandle. This value set is different from the value set of the "type" attribute		ResourceHandle. This value set is different from the value set of the "type" attribute
	in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure		in the ResourceDefinition (refer to clause 9.5.3.2). When the container infrastructure
	@@ -287,7 +291,7 @@ definitions:
	resource, as would correspond to the 'kind' field if the resource is declared in its own		resource, as would correspond to the 'kind' field if the resource is declared in its own
	Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition.		Kubernetes® manifest, e.g.: Pod, PersistentVolumeClaim, NetworkAttachmentDefinition.

	* NOTE 2: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be		* NOTE 3: When the container infrastructure service management is a Kubernetes® instance the resourceId shall be
	populated in the following way:		populated in the following way:
	- For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide		- For a compute MCIO, it is the instance identifier that Kubernetes® assigns, which is unique cluster wide
	per resource type.		per resource type.

Admin message