fixed issue #22 (d029cd5c) · Commits · NFV - Network Functions Virtualisation / SOL005

src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml

+62 −38

Original line number	Original line	Diff line number	Diff line
	@@ -2367,8 +2367,15 @@ definitions:
	and the actual NS instantiation operation is performed using the resources reserved during the feasibility checking		and the actual NS instantiation operation is performed using the resources reserved during the feasibility checking
	procedure execution, and at the time indicated by the "startTime" attribute, if provided.		procedure execution, and at the time indicated by the "startTime" attribute, if provided.

	required:		oneOf:
			- required:
			- nsFlavourId
			- required:
	- nsFlavourId		- nsFlavourId
			- nsInstantiationLevelId
			- required:
			- nsFlavourId
			- targetNsScaleLevelInfo
	properties:		properties:
	nsFlavourId:		nsFlavourId:
	description: >		description: >
	@@ -2754,9 +2761,12 @@ definitions:
	version dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant identifier.		version dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant identifier.
	NOTE 4: The overridingVersionDependency attribute may only be present if the overridingVnfdId attribute is present.		NOTE 4: The overridingVersionDependency attribute may only be present if the overridingVnfdId attribute is present.
	type: object		type: object
	anyOf:		oneOf:
			- required:
			- vnfInstanceId
	- required:		- required:
	- vnfInstanceId		- vnfInstanceId
			- overridingVnfdId
	- required:		- required:
	- vnfInstanceId		- vnfInstanceId
	- overridingVnfdId		- overridingVnfdId
	@@ -2818,9 +2828,12 @@ definitions:
	NOTE 4: The overridingVersionDependency attribute may only be present if the overridingNsdId attribute is present.		NOTE 4: The overridingVersionDependency attribute may only be present if the overridingNsdId attribute is present.

	type: object		type: object
	anyOf:		oneOf:
			- required:
			- nestedNsInstanceId
	- required:		- required:
	- nestedNsInstanceId		- nestedNsInstanceId
			- overridingNsdId
	- required:		- required:
	- nestedNsInstanceId		- nestedNsInstanceId
	- overridingNsdId		- overridingNsdId
	@@ -3304,9 +3317,9 @@ definitions:
	dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant identifier.		dependencies of the descriptor referenced in the profile or of other descriptors with the same external invariant identifier.
	NOTE 9: The overridingVersionDependency attribute may only be present if the overridingVnfdId attribute is present.		NOTE 9: The overridingVersionDependency attribute may only be present if the overridingVnfdId attribute is present.
	type: object		type: object

	oneOf:		oneOf:
	- anyOf:		- oneOf:
	- anyOf:
	- required:		- required:
	- vnfdId		- vnfdId
	- vnfFlavourId		- vnfFlavourId
	@@ -3317,7 +3330,6 @@ definitions:
	- vnfInstantiationLevelId		- vnfInstantiationLevelId
	- overridingVnfdId		- overridingVnfdId
	- overridingVersionDependency		- overridingVersionDependency
	- vnfProfileId
	- required:		- required:
	- vnfdId		- vnfdId
	- vnfFlavourId		- vnfFlavourId
	@@ -3326,14 +3338,13 @@ definitions:
	- vnfFlavourId		- vnfFlavourId
	- overridingVnfdId		- overridingVnfdId
	- overridingVersionDependency		- overridingVersionDependency
	- vnfProfileId		- oneOf:
	- anyOf:
	- required:		- required:
	- vnProfileId		- vnfProfileId
	- required:		- required:
			- vnfProfileId
	- overridingVnfdId		- overridingVnfdId
	- overridingVersionDependency		- overridingVersionDependency
	- vnfProfileId

	properties:		properties:
	defaultInstantiationLevel:		defaultInstantiationLevel:
	@@ -3507,9 +3518,18 @@ definitions:
	are not scalable, the default instantiation level as declared in the VNFD		are not scalable, the default instantiation level as declared in the VNFD
	shall be used for instantiation.		shall be used for instantiation.
	type: object		type: object
			oneOf:
			- required:
			- vnfInstanceId
			- newFlavourId
			- required:
			- vnfInstanceId
			- newFlavourId
			- instantiationLevelId
	required:		required:
	- vnfInstanceId		- vnfInstanceId
	- newFlavourId		- newFlavourId
			- targetScaleLevelInfo
	properties:		properties:
	vnfInstanceId:		vnfInstanceId:
	description: >		description: >
	@@ -5903,15 +5923,19 @@ definitions:
	container infrastructure service is a Kubernetes® instance is a network		container infrastructure service is a Kubernetes® instance is a network
	attachment definition (NAD).		attachment definition (NAD).
	type: object		type: object
	anyOf:		oneOf:
	- required:		- required:
	- vnfVirtualLinkDescId		- vnfVirtualLinkDescId
	- resourceId		- resourceId
	- required:		- required:
	- vnfVirtualLinkDescId		- vnfVirtualLinkDescId
	- resourceId		- resourceId
	- intCp
	- netAttDefResourceData		- netAttDefResourceData
			- required:
			- vnfVirtualLinkDescId
			- resourceId
			- netAttDefResourceData
			- intCp
	properties:		properties:
	extManagedVirtualLinkId:		extManagedVirtualLinkId:
	description: >		description: >