Updated reference descriptor YAML files for SOL001 and SOL006 (ad5297ca) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL002/VNFLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml

+41 −41

Original line number	Diff line number	Diff line
		@@ -15,44 +15,6 @@ topology_template:
		virtual_link_right:
		[right, virtual_link_right]
		node_templates:
		VDU-B-1:
		type: "tosca.nodes.nfv.Vdu.Compute"
		properties:
		name: "vdu-b-1-vcd"
		descriptor: "Description of VDU-B-1"
		vdu_profile:
		min_number_of_instances: 1
		max_number_of_instances: 2
		capabilities:
		virtual_compute:
		properties:
		virtual_memory:
		virtual_mem_size: 4096
		numa_enabled: false
		virtual_cpu:
		num_virtual_cpu: 2
		requirements:
		virtual_storage:
		- "vdu-b-1-vsd"
		VDU-B-2:
		type: "tosca.nodes.nfv.Vdu.Compute"
		properties:
		name: "vdu-b-2-vcd"
		descriptor: "Description of VDU-B-2"
		vdu_profile:
		min_number_of_instances: 1
		max_number_of_instances: 4
		capabilities:
		virtual_compute:
		properties:
		virtual_memory:
		virtual_mem_size: 6144
		numa_enabled: false
		virtual_cpu:
		num_virtual_cpu: 2
		requirements:
		virtual_storage:
		- "vdu-b-2-vsd"
		right:
		type: "tosca.nodes.nfv.VduCp"
		properties:
		@@ -101,7 +63,7 @@ topology_template:
		requirements:
		- virtual_binding: VDU-B-2
		- virtual_link: internal_vl
		vdu-b-1-vsd:
		vdu_b_1_vsd:
		type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
		properties:
		virtual_block_storage_data:
		@@ -122,14 +84,14 @@ topology_template:
		sw_image:
		type: "tosca.artifacts.nfv.SwImage"
		file: vdu-b-1.qcow2
		vdu-b-1-vsd:
		vdu_b_2_vsd:
		type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
		properties:
		virtual_block_storage_data:
		size_of_storage: 20
		rdma_enabled: false
		sw_image_data:
		name: "vdu-b-1 image"
		name: "vdu-b-2 image"
		version: "1.1"
		checksum:
		algorithm: "sha-224"
		@@ -166,3 +128,41 @@ topology_template:
		implementation: terminate-example.yaml
		operate:
		implementation: operate-example.yaml
		VDU_B_1:
		type: "tosca.nodes.nfv.Vdu.Compute"
		properties:
		name: "vdu-b-1-vcd"
		descriptor: "Description of VDU-B-1"
		vdu_profile:
		min_number_of_instances: 1
		max_number_of_instances: 2
		capabilities:
		virtual_compute:
		properties:
		virtual_memory:
		virtual_mem_size: 4096
		numa_enabled: false
		virtual_cpu:
		num_virtual_cpu: 2
		requirements:
		virtual_storage:
		- "vdu-b-1-vsd"
		VDU_B_2:
		type: "tosca.nodes.nfv.Vdu.Compute"
		properties:
		name: "vdu-b-2-vcd"
		descriptor: "Description of VDU-B-2"
		vdu_profile:
		min_number_of_instances: 1
		max_number_of_instances: 4
		capabilities:
		virtual_compute:
		properties:
		virtual_memory:
		virtual_mem_size: 6144
		numa_enabled: false
		virtual_cpu:
		num_virtual_cpu: 2
		requirements:
		virtual_storage:
		- "vdu-b-2-vsd"
		No newline at end of file

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

+92 −93

Original line number	Diff line number	Diff line
		@@ -2,137 +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
		- 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
		vdu:
		id: vdu-b-2
		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

SOL002/VNFLifecycleManagement-API/environment/variables.txt

+23 −10

Original line number	Diff line number	Diff line
		@@ -79,13 +79,26 @@ ${vnfdIds} 6fc3539c-e602-4afa-8e13-962fb5a7d81f

		${callbackResp} localhost

		${descriptorType} SOL001
		${vnfKey} {}
		${check_descriptors} 1

		${descriptor_id}
		${provider}
		${product_name}
		${software_version}
		${descriptor_version}
		Post ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances ${body}
		No newline at end of file
		${descriptorType} SOL006

		${tosca_type_VDU_compute} tosca.nodes.nfv.Vdu.Compute
		${tosca_type_VNF} tosca.nodes.nfv.VNF
		${tosca_type_virtual_link} tosca.nodes.nfv.VnfVirtualLink
		${tosca_type_VDU_cp} tosca.nodes.nfv.VduCp
		${tosca_type_storage} tosca.nodes.nfv.Vdu.VirtualBlockStorage

		@{VDU_IDs}
		@{VNF_IDs}
		@{virtualLink_IDs}
		@{CP_IDs}
		@{Storage_IDs}
		@{internalCP_IDs}
		@{externalCP_IDs}
		@{InstantiationLevel_IDs}

		${Descriptor_ID}
		${Provider}
		${Product_Name}
		${Software_Version}
		${Descriptor_Version}