Descriptor checks added for 7.3.1.2.4 and 7.3.1.6.1-2 (2e63adf7) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

+7 −17

Original line number	Diff line number	Diff line
		@@ -333,12 +333,13 @@ POST Change VNF deployment flavour
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Run Keyword If ${check_descriptors} == 1 Add VNF Descriptor Content to Change VNF Flavour
		Run Keyword If ${check_descriptors} == 1 PARSE the Descriptor File
		${template}= Get File jsons/changeVnfFlavourRequest.json
		${body}= Format String ${template} newFlavourId=${newFlavourId}
		${body}= Format String ${template} newFlavourId=${Flavour_ID}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour ${body}
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}

		GET Change VNF deployment flavour
		log Trying to perform a GET. This method should not be implemented
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		@@ -504,9 +505,9 @@ PATCH individual vnfInstance
		Set Headers {"Accept":"${ACCEPT}"}
		Set Headers {"Content-Type": "${CONTENT_TYPE_PATCH}"}
		Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
		Run Keyword If ${check_descriptors} == 1 Add VNF Descriptor Content to VNF Instance
		Run Keyword If ${check_descriptors} == 1 PARSE the Descriptor File
		${template}= Get File jsons/patchBodyRequest.json
		${body}= Format String ${template} vnfdId=${descriptor_id} vnfdVersion= ${descriptor_version}
		${body}= Format String ${template} vnfdId=${Descriptor_ID} vnfdVersion= ${Descriptor_Version}
		Patch ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId} ${body}
		${outputResponse}= Output response
		Set Global Variable ${response} ${outputResponse}
		@@ -1337,8 +1338,6 @@ Match the VNF Instance Response Attributes with Descriptors
		List Should Contain value ${Storage_IDs} ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo']['virtualStorageDescId']}
		List Should Contain Value ${VirtualLink_IDs} ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo']['vnfVirtualLinkDescId']}



		Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
		Run Keyword If ${check_descriptors} == 1 Check Individual VNF LCM Operation Occurence Content

		@@ -1377,12 +1376,3 @@ Parse SOL006 VNF Instance
		${software_version}= Get Variable Value ${nfv.vnfd[0].software-version}
		${descriptor_version}= Get Variable Value ${nfv.vnfd[0].version}

		No newline at end of file
		Add VNF Descriptor Content to Change VNF Flavour
		Run Keyword If '${descriptorType}'=='SOL001' Parse SOL001 Change VNF Flavour ELSE Parse SOL006 Change VNF Flavour

		Parse SOL001 Change VNF Flavour
		Get key for VNF Descriptor
		${newFlavourId}= Get Variable Value ${topology_template.node_templates.${vnfKey}.properties.flavour_id}

		Parse SOL006 Change VNF Flavour
		Log flavour id is not present in SOL006 descriptors
		No newline at end of file

SOL003/VNFLifecycleManagement-API/descriptors/SOL006/SOL002_VNFLifecycleManagement-API_descriptors_SOL006_reference_tst010_vnf_b_2vdu_SOL006.yaml

+82 −82

Original line number	Diff line number	Diff line
		@@ -2,136 +2,136 @@ nfv:
		vnfd:
		- id: VNF-B-2vdu
		provider: ETSI TST WG
		product_name: TST010 reference VNF-B with 2 VDUs
		software_version: '2.2'
		product-name: TST010 reference VNF-B with 2 VDUs
		software-version: '2.2'
		version: '2.2'
		vnfm_info: ETSI VNFM
		vnfm-info: ETSI VNFM
		vdu:
		- id: vdu-b-1
		name: VNF-B VDU 1
		int_cpd:
		int-cpd:
		- id: left
		layer_protocol: ethernet
		layer-protocol: ethernet
		- id: management
		layer_protocol: ethernet
		layer-protocol: ethernet
		- 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
		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
		- id: vdu-b-2
		name: VNF-B VDU 2
		int_cpd:
		int-cpd:
		- id: right
		layer_protocol: ethernet
		layer-protocol: ethernet
		- id: management
		layer_protocol: ethernet
		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:
		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:
		virtual-memory:
		size: '4.0'
		virtual_cpu:
		num_virtual_cpu: '2'
		virtual_storage_desc:
		virtual-cpu:
		num-virtual-cpu: '2'
		virtual-storage-desc:
		id: vdu-b-1-vsd
		type_of_storage: root-storage
		size_of_storage: '0'
		sw_image_desc:
		type-of-storage: root-storage
		size-of-storage: '0'
		sw-image-desc:
		id: vdu-b-1-image
		name: VNF-B image
		version: '1.1'
		checksum:
		algorithm: sha-224
		hash: somehashfortst010
		container_format: bare
		disk_format: qcow2
		min_disk: '1'
		min_ram: '2.0'
		container-format: bare
		disk-format: qcow2
		min-disk: '1'
		min-ram: '2.0'
		size: '1'
		image: 'http://someurl.com/VNF-B.qcow2'
		virtual_compute_desc:
		virtual-compute-desc:
		id: vdu-b-2-vcd
		virtual_memory:
		virtual-memory:
		size: '6.0'
		virtual_cpu:
		num_virtual_cpu: '2'
		virtual_storage_desc:
		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:
		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'
		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:
		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:
		packet-delay-variation: '1'
		packet-loss-ratio: '0.05'
		connectivity-type:
		layer-protocol: ethernet
		ext-cpd:
		- id: ext-b-left
		int_cpd:
		vdu_id: vdu-b-1
		int-cpd:
		vdu-id: vdu-b-1
		cpd: left
		layer_protocol: ethernet
		layer-protocol: ethernet
		- id: management
		int_cpd:
		vdu_id: vdu-b-1
		int-cpd:
		vdu-id: vdu-b-1
		cpd: management
		layer_protocol: ethernet
		layer-protocol: ethernet
		- id: ext-b-right
		int_cpd:
		vdu_id: vdu-b-2
		int-cpd:
		vdu-id: vdu-b-2
		cpd: right
		layer_protocol: ethernet
		layer-protocol: ethernet
		df:
		id: normal
		vdu_profile:
		vdu-profile:
		- id: vdu-b-1
		min_number_of_instances: '1'
		max_number_of_instances: '2'
		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:
		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'
		- vdu_id: vdu-b-2
		number_of_instances: '2'
		vdu-level:
		- 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
		number_of_instances: '1'
		- vdu_id: vdu-b-2
		number_of_instances: '1'
		default_instantiation_level: single
		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'
		No newline at end of file
		vdu-level:
		- 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:
		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'
		No newline at end of file

Admin message