SOL006 descriptors updated (3fb8875a) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL002/VNFLifecycleManagement-API/VNFInstances.robot

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ POST Create a new vnfInstance
		POST Create a new vnfInstance
		Check HTTP Response Status Code Is 201
		Check HTTP Response Body Json Schema Is vnfInstance
		Check HTTP Response Body vnfInstance content against VNF Descriptor

		GET information about multiple VNF instances
		[Documentation] Test ID: 6.3.5.1.2

SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot

+14 −1

Original line number	Diff line number	Diff line
		@@ -1058,12 +1058,25 @@ Parse SOL006
		${product_name}= Get Variable Value ${nfv.vnfd[0].product-name}
		${software_version}= Get Variable Value ${nfv.vnfd[0].software-version}
		${descriptor_version}= Get Variable Value ${nfv.vnfd[0].version}
		${external_cp}= Get Variable Value ${nfv.vnfd[0].ext-cpd[0].id}
		${vdu_id}= Get Variable Value ${nfv.vnfd[0].vdu[0].id}
		${vdu_cpid}= Get Variable Value ${nfv.vnfd[0].vdu[0].int-cpd[2].id}
		${virtual_storage}= Get Variable Value ${nfv.vnfd[0].virtual-storage-desc.id}
		${virtual_link}= Get Variable Value ${nfv.vnfd[0].int-virtual-link-desc.id}


		Should Be Equal As Strings ${response['body']['vnfdId']} ${descriptor_id}
		Should Be Equal As Strings ${response['body']['vnfProvider']} ${provider}
		Should Be Equal As Strings ${response['body']['vnfProductName']} ${product_name}
		Should Be Equal As Strings ${response['body']['vnfSoftwareVesion']} ${software_version}
		Should Be Equal As Strings ${response['body']['vnfdVersion']} ${descriptor_version}
		Should Be Equal As Strings ${response['body']['instantiatedVnfInfo']['extCpInfo']['cpdId']} ${external_cp}
		Should Be Equal As Strings ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']} ${vdu_id}
		Should Be Equal As Strings ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vnfcCpInfo']['cpdId']} ${vdu_cpid}
		Should Be Equal As Strings ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']} ${virtual_storage}
		Should Be Equal As Strings ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']} ${virtual_link}



		Add VNF Descriptor Content to VNF Instance
		Run Keyword If '${descriptorType}'=='SOL001' Parse SOL001 VNF Instance ELSE Parse SOL006 VNF Instance

SOL002/VNFLifecycleManagement-API/descriptors/SOL001/vnf-b-1_VNF.yaml→SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml

+4 −4

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ topology_template:
		virtual_link_left:
		virtual_binding: VDU-B-1
		internal_vl:
		type: tosca.nodes.nfv.VnfVirtualLink
		type: "tosca.nodes.nfv.VnfVirtualLink"
		properties:
		connectivity_type:
		layer_protocols: [ ipv4 ]
		@@ -88,14 +88,14 @@ topology_template:
		root: 10000
		leaf: 10000
		internal_vdu_b_1_cp:
		type: tosca.nodes.nfv.VduCp
		type: "tosca.nodes.nfv.VduCp"
		properties:
		order: 2
		requirements:
		- virtual_binding: VDU-B-1
		- virtual_link: internal_vl
		internal_vdu_b_2_cp:
		type: tosca.nodes.nfv.VduCp
		type: "tosca.nodes.nfv.VduCp"
		properties:
		order: 0
		requirements:
		@@ -120,7 +120,7 @@ topology_template:
		size: '1'
		artifacts:
		sw_image:
		type: tosca.artifacts.nfv.SwImage
		type: "tosca.artifacts.nfv.SwImage"
		file: vdu-b-1.qcow2
		vdu-b-1-vsd:
		type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"

SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml→SOL002/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml

+138 −0

Original line number	Diff line number	Diff line
		nfv:
		vnfd:
		- id: VNF-B-2df
		- id: VNF-B-2vdu
		provider: ETSI TST WG
		product-name: TST010 reference VNF-B with 2 DFs
		software-version: '2.1'
		version: '2.1'
		product-name: TST010 reference VNF-B with 2 VDUs
		software-version: '2.2'
		version: '2.2'
		vnfm-info: ETSI VNFM
		vdu:
		id: vdu-b-1
		@@ -14,11 +14,26 @@ nfv:
		layer-protocol: ethernet
		- id: management
		layer-protocol: ethernet
		- id: right
		- id: internal
		layer-protocol: ethernet
		int-virtual-link-desc: internal-vl
		virtual-compute-desc: vdu-b-1-vcd
		virtual-storage-desc: vdu-b-1-vsd
		sw-image-desc: vdu-b-1-image
		vdu:
		id: vdu-b-2
		name: VNF-B VDU 2
		int-cpd:
		- id: right
		layer-protocol: ethernet
		- id: management
		layer-protocol: ethernet
		- id: internal
		layer-protocol: ethernet
		int-virtual-link-desc: internal-vl
		virtual-compute-desc: vdu-b-2-vcd
		virtual-storage-desc: vdu-b-2-vsd
		sw-image-desc: vdu-b-2-image
		virtual-compute-desc:
		id: vdu-b-1-vcd
		virtual-memory:
		@@ -42,6 +57,39 @@ nfv:
		min-ram: '2.0'
		size: '1'
		image: 'http://someurl.com/VNF-B.qcow2'
		virtual-compute-desc:
		id: vdu-b-2-vcd
		virtual-memory:
		size: '6.0'
		virtual-cpu:
		num-virtual-cpu: '2'
		virtual-storage-desc:
		id: vdu-b-2-vsd
		type-of-storage: root-storage
		size-of-storage: '0'
		sw-image-desc:
		id: vdu-b-2-image
		name: VNF-B-2 image
		version: '1.1'
		checksum:
		algorithm: sha-224
		hash: somehashfortst010
		container-format: bare
		disk-format: qcow2
		min-disk: '1'
		min-ram: '2.0'
		size: '1'
		image: 'http://someurl.com/VNF-B-2.qcow2'
		int-virtual-link-desc:
		- id: internal-vl
		flavour:
		id: internal-vl-flavour
		qos:
		latency: '1'
		packet-delay-variation: '1'
		packet-loss-ratio: '0.05'
		connectivity-type:
		layer-protocol: ethernet
		ext-cpd:
		- id: ext-b-left
		int-cpd:
		@@ -55,23 +103,30 @@ nfv:
		layer-protocol: ethernet
		- id: ext-b-right
		int-cpd:
		vdu-id: vdu-b-1
		vdu-id: vdu-b-2
		cpd: right
		layer-protocol: ethernet
		df:
		- id: small
		id: normal
		vdu-profile:
		id: vdu-b-1
		- id: vdu-b-1
		min-number-of-instances: '1'
		max-number-of-instances: '2'
		- id: vdu-b-2
		min-number-of-instances: '1'
		max-number-of-instances: '4'
		instantiation-level:
		- id: double
		vdu-level:
		vdu-id: vdu-b-1
		- vdu-id: vdu-b-1
		number-of-instances: '2'
		- vdu-id: vdu-b-2
		number-of-instances: '2'
		- id: single
		vdu-level:
		vdu-id: vdu-b-1
		- vdu-id: vdu-b-1
		number-of-instances: '1'
		- vdu-id: vdu-b-2
		number-of-instances: '1'
		default-instantiation-level: single
		lcm-operations-configuration:
		@@ -81,25 +136,3 @@ nfv:
		min-graceful-termination: '1'
		operate-vnf-op-config:
		min-graceful-stop-timeout: '1'
		No newline at end of file
		- id: big
		vdu-profile:
		id: vdu-b-1
		min-number-of-instances: '1'
		max-number-of-instances: '4'
		instantiation-level:
		- id: double
		vdu-level:
		vdu-id: vdu-b-1
		number-of-instances: '2'
		- id: triple
		vdu-level:
		vdu-id: vdu-b-1
		number-of-instances: '3'
		default-instantiation-level: double
		lcm-operations-configuration:
		scale-vnf-to-level-op-config:
		arbitrary-target-levels-supported: 'true'
		terminate-vnf-op-config:
		min-graceful-termination: '1'
		operate-vnf-op-config:
		min-graceful-stop-timeout: '1'