resolve issues raised by Vlademir in SOL002 and SOL003 v4.3.1 (e7fc1e28) · Commits · NFV - Network Functions Virtualisation / SOL002-SOL003

src/SOL002/General_Definitions/SOL002_def.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -773,7 +773,7 @@ definitions:
		It may be present for storage resources in the scope of
		the CISM and shall be absent otherwise. See note.
		type: string
		AdditionalResourceInfo:
		additionalInfo:
		description: >
		Information related to other properties directly owned by
		the resource and available from the VIM or CISM or the

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

+5 −5

Original line number	Diff line number	Diff line
		@@ -1217,10 +1217,6 @@ definitions:
		of a trunk that the present VNFC CP instance participates in.
		Shall be provided if the present CP instance participates in a trunk as subport.
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf"
		metadata:
		description: >
		Metadata about this CP.
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs"
		netAttDefResourceId:
		description: >
		Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface
		@@ -1230,6 +1226,10 @@ definitions:
		type: array
		items:
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
		metadata:
		description: >
		Metadata about this CP.
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs"
		metadata:
		description: >
		Metadata about this resource.
		@@ -2647,7 +2647,7 @@ definitions:
		exposed by this external CP instance. Shall be present in case this CP instance maps to an internal
		VL (including externally-managed internal VL). See note 1.
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf"
		netAttDefResourceInfoId:
		netAttDefResourceId:
		description: >
		Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the
		connection point to a secondary container cluster network. See notes 3 and 4.

src/SOL003/General_Definitions/SOL003_def.yaml

+10 −10

Original line number	Diff line number	Diff line
		@@ -190,8 +190,8 @@ definitions:
		This type represents parameters to connect to a VIM, a CISM, a CIR or a MCIOP repository for managing
		the resources of a VNF instance.

		This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-relate
		dparameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP
		This structure is used to convey VIM-related, CISM-related, CIR-related, or MCIOP-repository-related
		parameters over the Or-Vnfm interface. Additional parameters for a VIM, a CISM, a CIR or a MCIOP
		repository may be configured into the VNFM by means outside the scope of the present document and
		bound to the identifier of that VIM.

		@@ -205,7 +205,7 @@ definitions:
		required properties for authentication purpose), will be transmitted as plain text through a TLS tunnel
		without additional encoding/encryption before transmitting it, making the sensitive data visible to the
		endpoint. The base64 encoded certificates are only used by the VNFM to verify the authenticity of the
		interface endpoint of the VIM., CISM, CIR or MCIOP repository.
		interface endpoint of the VIM, CISM, CIR or MCIOP repository.
		type: object
		required:
		- vimType
		@@ -315,12 +315,12 @@ definitions:
		resourceId:
		description: >
		Identifier of the resource in the scope of the VIM or the
		CISM or the resource provider. See note 3.
		CISM or the resource provider. See note 2.
		$ref: "#/definitions/IdentifierInVim"
		vimLevelResourceType:
		description: >
		Type of the resource in the scope of the VIM or the CISM
		or the resource provider. See note 2.
		or the resource provider. See note 1.
		type: string
		vimLevelAdditionalResourceInfo:
		description: >
		@@ -706,7 +706,7 @@ definitions:
		external connection points to this external VL. If this
		attribute is not present, the VNFM shall create the link
		ports on the external VL except in the cases defined
		below. See note 2.
		below. See note 1.
		type: array
		items:
		$ref: "#/definitions/ExtLinkPortData"
		@@ -714,7 +714,7 @@ definitions:
		description: >
		Externally provided network attachment definition
		resource(s) that provide the specification of the interface
		to attach external CPs to this external VL. See note 3.
		to attach external CPs to this external VL. See note 2.
		It is only applicable if the external VL is realized by a
		secondary container cluster network. It shall not be
		present otherwise.
		@@ -741,7 +741,7 @@ definitions:
		attribute of the VnfInstance (e.g. during a "Change
		current VNF package" operation or due to its final
		failure).
		$ref: "#/definitions/IdentifierInVnfd"
		$ref: "#/definitions/Identifier"
		scaleToLevel:
		description: >
		Indicates the scale level. The minimum value shall be 0
		@@ -754,7 +754,7 @@ definitions:
		This type represents additional resource information which resource and resource type
		specific, and which is available from the VIM or the CISM or the resource provider.

		NOTE: At least one attribute shall be present.
		* NOTE: At least one attribute shall be present.
		type: object
		properties:
		hostName:
		@@ -770,7 +770,7 @@ definitions:
		It may be present for storage resources in the scope of
		the CISM and shall be absent otherwise. See note.
		type: string
		AdditionalResourceInfo:
		additionalInfo:
		description: >
		Information related to other properties directly owned by
		the resource and available from the VIM or CISM or the

src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml

+34 −27

Original line number	Diff line number	Diff line
		@@ -24,6 +24,11 @@ definitions:
		scalable constituents of the VNF (e.g, VDUs/VLs). For scaling aspects not specified in targetScaleLevelInfo or
		for the VNF constituents (e.g.,VDUs/VLs) that are not scalable, the default instantiation level as declared in the
		VNFD shall be used for instantiation.
		anyOf:
		- required:
		- instantiationLevelId
		- required:
		- targetScaleLevelInfo
		type: object
		required:
		- flavourId
		@@ -80,7 +85,7 @@ definitions:
		This attribute shall only be supported and may be
		present if
		- the resources for at least one of the VNFCs
		shall be managed by a VIM and VNFrelated resource management in direct
		shall be managed by a VIM and VNF-related resource management in direct
		mode is applicable.
		- the resources for at least one of the VNFCs
		shall be managed by a CISM.
		@@ -228,8 +233,7 @@ definitions:
		instantiationLevelId:
		description: >
		Identifier of the instantiation level of the deployment flavour to
		be instantiated. See note 3. If not present, the default instantiation level as
		declared in the VNFD is instantiated.
		be instantiated. See note 3.
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
		targetScaleLevelInfo:
		description: >
		@@ -511,7 +515,7 @@ definitions:
		description: >
		Additional parameters passed by the NFVO as input to the process, specific
		to the VNF of which the underlying VNF package is changed, as declared in
		the VNFD as part of "ChangeCurrentVnfPkgOpConfig" " defined in ETSI GS NFV-IFA 011 [10].
		the VNFD as part of "ChangeCurrentVnfPkgOpConfig" defined in ETSI GS NFV-IFA 011 [10].
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"
		extensions:
		description: >
		@@ -802,6 +806,7 @@ definitions:
		- vnfSoftwareVersion
		- vnfdVersion
		- instantiationState
		- _links
		properties:
		id:
		description: >
		@@ -935,6 +940,7 @@ definitions:
		required:
		- flavourId
		- vnfState
		- extCpInfo
		properties:
		flavourId:
		description: >
		@@ -1385,19 +1391,13 @@ definitions:
		Shall be present if the CP is associated to a link port on an internal VL (including externally-managed internal VL)
		of the VNF instance and shall be absent otherwise.
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf"
		metadata:
		description: >
		Metadata about this CP.
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"

		parentCpId:
		description: >
		Identifier of another VNFC CP instance that corresponds to the parent port of a trunk that the present VNFC CP
		instance participates in. Shall be provided if the present CP instance participates in a trunk as subport, and
		the referred VNFC CP instances are also present in the vnfcCpInfo attribute.
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf"

		netAttDefResourceInfoId:
		netAttDefResourceId:
		description: >
		Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the
		connection point to a secondary container cluster network. See notes 5 and 6.
		@@ -1406,6 +1406,10 @@ definitions:
		type: array
		items:
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"
		metadata:
		description: >
		Metadata about this CP.
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"

		metadata:
		description: >
		@@ -2575,6 +2579,8 @@ definitions:
		provides the specification of the interface to attach the VNF
		internal CP created from the CPD identified by cpdId to a
		secondary container cluster network. See note.
		type: array
		items:
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"

		CreateVnfRequest:
		@@ -2639,7 +2645,7 @@ definitions:
		description: >
		Additional parameters passed by the NFVO as input to the scaling
		process, specific to the VNF being scaled, as declared in the VNFD
		as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [7].
		as part of "ScaleVnfOpConfig" defined in ETSI GS NFV-IFA 011 [10].
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"

		ScaleVnfToLevelRequest:
		@@ -2674,7 +2680,7 @@ definitions:
		description: >
		Additional parameters passed by the NFVO as input to the scaling
		process, specific to the VNF being scaled, as declared in the
		VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [7].
		VNFD as part of "ScaleVnfToLevelOpConfig" defined in ETSI GS NFV-IFA 011 [10].
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"

		CancelMode:
		@@ -3230,7 +3236,7 @@ definitions:
		description: >
		Identifier of the "VirtualCpInfo" structure that represents the Virtual CP that is exposed by this
		external CP instance. Shall be present in case this CP instance maps to a Virtual CP. See note 1.
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf"
		associatedVnfVirtualLinkId:
		description: >
		Identifier of the "VnfVirtualLinkResourceInfo" structure that represents the internal VL or of the
		@@ -3238,10 +3244,11 @@ definitions:
		exposed by this external CP instance. Shall be present in case this CP instance maps to an internal
		VL (including externally-managed internal VL). See note 1.
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf"
		netAttDefResourceInfoId:
		netAttDefResourceId:
		description: >
		Identifier of the “NetAttDefResourceInfo” structure that provides the specification of the interface to attach the
		connection point to a secondary container cluster network. See notes 3 and 4.

		It shall be present if the external CP is associated to a VNFC realized by one or a set of OS containers and
		is connected to a secondary container cluster network. It shall not be present otherwise.
		type: array
		@@ -3661,7 +3668,7 @@ definitions:
		properties:
		cpInstanceId:
		description: >
		dentifier of the virtual CP instance and the related "VirtualCpInfo"
		Identifier of the virtual CP instance and the related "VirtualCpInfo"
		structure in "VnfInstance".
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnf"
		cpdId:

src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml

+16 −2

Original line number	Diff line number	Diff line
		@@ -36,6 +36,13 @@ definitions:
		scalable constituents of the VNF (e.g, VDUs/VLs) in the granting process. For scaling aspects not
		specified in targetScaleLevelInfo or for the VNF constituents (e.g.,VDUs/VLs) that are not scalable,
		the default instantiation level as declared in the VNFD shall be used in the granting process.
		anyOf:
		- required:
		- instantiationLevelId
		- required:
		- targetScaleLevelInfo
		- required:
		- addResources
		type: object
		required:
		- vnfInstanceId
		@@ -111,6 +118,8 @@ definitions:
		the scale level of VNF constituents (e.g.,
		VDU level) to be instantiated. See notes 2,
		7 and 8.
		type: array
		items:
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ScaleInfo"
		addResources:
		description: >
		@@ -459,6 +468,7 @@ definitions:
		required:
		- id
		- type
		- resourceTemplateId
		properties:
		id:
		description: >
		@@ -473,6 +483,8 @@ definitions:
		* VL
		* STORAGE
		* LINKPORT
		* OSCONTAINER
		* VIRTUALCP
		type: string
		enum:
		- COMPUTE
		@@ -608,6 +620,8 @@ definitions:
		to the MCIO constraint.
		This attribute shall be present if the granted resources are managed by a CISM. The attribute shall be
		absent if the granted resources are not managed by a CISM.
		type: array
		items:
		$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"
		ZoneInfo:
		description: >