Loading SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml +41 −41 Original line number Original line Diff line number Diff line Loading @@ -15,44 +15,6 @@ topology_template: virtual_link_right: virtual_link_right: [right, virtual_link_right] [right, virtual_link_right] node_templates: 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: right: type: "tosca.nodes.nfv.VduCp" type: "tosca.nodes.nfv.VduCp" properties: properties: Loading Loading @@ -101,7 +63,7 @@ topology_template: requirements: requirements: - virtual_binding: VDU-B-2 - virtual_binding: VDU-B-2 - virtual_link: internal_vl - virtual_link: internal_vl vdu-b-1-vsd: vdu_b_1_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: Loading @@ -122,14 +84,14 @@ topology_template: sw_image: sw_image: type: "tosca.artifacts.nfv.SwImage" type: "tosca.artifacts.nfv.SwImage" file: vdu-b-1.qcow2 file: vdu-b-1.qcow2 vdu-b-1-vsd: vdu_b_2_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: size_of_storage: 20 size_of_storage: 20 rdma_enabled: false rdma_enabled: false sw_image_data: sw_image_data: name: "vdu-b-1 image" name: "vdu-b-2 image" version: "1.1" version: "1.1" checksum: checksum: algorithm: "sha-224" algorithm: "sha-224" Loading Loading @@ -166,3 +128,41 @@ topology_template: implementation: terminate-example.yaml implementation: terminate-example.yaml operate: operate: implementation: operate-example.yaml 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 SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml +92 −93 Original line number Original line Diff line number Diff line Loading @@ -2,137 +2,136 @@ nfv: vnfd: vnfd: - id: VNF-B-2vdu - id: VNF-B-2vdu provider: ETSI TST WG provider: ETSI TST WG product-name: TST010 reference VNF-B with 2 VDUs product_name: TST010 reference VNF-B with 2 VDUs software-version: '2.2' software_version: '2.2' version: '2.2' version: '2.2' vnfm-info: ETSI VNFM vnfm_info: ETSI VNFM vdu: vdu: id: vdu-b-1 - id: vdu-b-1 name: VNF-B VDU 1 name: VNF-B VDU 1 int-cpd: int_cpd: - id: left - id: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-1-vcd virtual_compute_desc: vdu-b-1-vcd virtual-storage-desc: vdu-b-1-vsd virtual_storage_desc: vdu-b-1-vsd sw-image-desc: vdu-b-1-image sw_image_desc: vdu-b-1-image vdu: - id: vdu-b-2 id: vdu-b-2 name: VNF-B VDU 2 name: VNF-B VDU 2 int-cpd: int_cpd: - id: right - id: right layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-2-vcd virtual_compute_desc: vdu-b-2-vcd virtual-storage-desc: vdu-b-2-vsd virtual_storage_desc: vdu-b-2-vsd sw-image-desc: vdu-b-2-image sw_image_desc: vdu-b-2-image virtual-compute-desc: virtual_compute_desc: id: vdu-b-1-vcd id: vdu-b-1-vcd virtual-memory: virtual_memory: size: '4.0' size: '4.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-1-vsd id: vdu-b-1-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-1-image id: vdu-b-1-image name: VNF-B image name: VNF-B image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B.qcow2' image: 'http://someurl.com/VNF-B.qcow2' virtual-compute-desc: virtual_compute_desc: id: vdu-b-2-vcd id: vdu-b-2-vcd virtual-memory: virtual_memory: size: '6.0' size: '6.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-2-vsd id: vdu-b-2-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-2-image id: vdu-b-2-image name: VNF-B-2 image name: VNF-B-2 image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B-2.qcow2' image: 'http://someurl.com/VNF-B-2.qcow2' int-virtual-link-desc: int_virtual_link_desc: - id: internal-vl - id: internal-vl flavour: flavour: id: internal-vl-flavour id: internal-vl-flavour qos: qos: latency: '1' latency: '1' packet-delay-variation: '1' packet_delay_variation: '1' packet-loss-ratio: '0.05' packet_loss_ratio: '0.05' connectivity-type: connectivity_type: layer-protocol: ethernet layer_protocol: ethernet ext-cpd: ext_cpd: - id: ext-b-left - id: ext-b-left int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: left cpd: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: management cpd: management layer-protocol: ethernet layer_protocol: ethernet - id: ext-b-right - id: ext-b-right int-cpd: int_cpd: vdu-id: vdu-b-2 vdu_id: vdu-b-2 cpd: right cpd: right layer-protocol: ethernet layer_protocol: ethernet df: df: id: normal id: normal vdu-profile: vdu_profile: - id: vdu-b-1 - id: vdu-b-1 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '2' max_number_of_instances: '2' - id: vdu-b-2 - id: vdu-b-2 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '4' max_number_of_instances: '4' instantiation-level: instantiation_level: - id: double - id: double vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '2' number_of_instances: '2' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '2' number_of_instances: '2' - id: single - id: single vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '1' number_of_instances: '1' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '1' number_of_instances: '1' default-instantiation-level: single default_instantiation_level: single lcm-operations-configuration: lcm_operations_configuration: scale-vnf-to-level-op-config: scale_vnf_to_level_op_config: arbitrary-target-levels-supported: 'true' arbitrary_target_levels_supported: 'true' terminate-vnf-op-config: terminate_vnf_op_config: min-graceful-termination: '1' min_graceful_termination: '1' operate-vnf-op-config: operate_vnf_op_config: min-graceful-stop-timeout: '1' min_graceful_stop_timeout: '1' No newline at end of file No newline at end of file SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml +41 −41 Original line number Original line Diff line number Diff line Loading @@ -15,44 +15,6 @@ topology_template: virtual_link_right: virtual_link_right: [right, virtual_link_right] [right, virtual_link_right] node_templates: 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: right: type: "tosca.nodes.nfv.VduCp" type: "tosca.nodes.nfv.VduCp" properties: properties: Loading Loading @@ -101,7 +63,7 @@ topology_template: requirements: requirements: - virtual_binding: VDU-B-2 - virtual_binding: VDU-B-2 - virtual_link: internal_vl - virtual_link: internal_vl vdu-b-1-vsd: vdu_b_1_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: Loading @@ -122,14 +84,14 @@ topology_template: sw_image: sw_image: type: "tosca.artifacts.nfv.SwImage" type: "tosca.artifacts.nfv.SwImage" file: vdu-b-1.qcow2 file: vdu-b-1.qcow2 vdu-b-1-vsd: vdu_b_2_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: size_of_storage: 20 size_of_storage: 20 rdma_enabled: false rdma_enabled: false sw_image_data: sw_image_data: name: "vdu-b-1 image" name: "vdu-b-2 image" version: "1.1" version: "1.1" checksum: checksum: algorithm: "sha-224" algorithm: "sha-224" Loading Loading @@ -166,3 +128,41 @@ topology_template: implementation: terminate-example.yaml implementation: terminate-example.yaml operate: operate: implementation: operate-example.yaml 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 SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml +92 −93 Original line number Original line Diff line number Diff line Loading @@ -2,137 +2,136 @@ nfv: vnfd: vnfd: - id: VNF-B-2vdu - id: VNF-B-2vdu provider: ETSI TST WG provider: ETSI TST WG product-name: TST010 reference VNF-B with 2 VDUs product_name: TST010 reference VNF-B with 2 VDUs software-version: '2.2' software_version: '2.2' version: '2.2' version: '2.2' vnfm-info: ETSI VNFM vnfm_info: ETSI VNFM vdu: vdu: id: vdu-b-1 - id: vdu-b-1 name: VNF-B VDU 1 name: VNF-B VDU 1 int-cpd: int_cpd: - id: left - id: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-1-vcd virtual_compute_desc: vdu-b-1-vcd virtual-storage-desc: vdu-b-1-vsd virtual_storage_desc: vdu-b-1-vsd sw-image-desc: vdu-b-1-image sw_image_desc: vdu-b-1-image vdu: - id: vdu-b-2 id: vdu-b-2 name: VNF-B VDU 2 name: VNF-B VDU 2 int-cpd: int_cpd: - id: right - id: right layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-2-vcd virtual_compute_desc: vdu-b-2-vcd virtual-storage-desc: vdu-b-2-vsd virtual_storage_desc: vdu-b-2-vsd sw-image-desc: vdu-b-2-image sw_image_desc: vdu-b-2-image virtual-compute-desc: virtual_compute_desc: id: vdu-b-1-vcd id: vdu-b-1-vcd virtual-memory: virtual_memory: size: '4.0' size: '4.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-1-vsd id: vdu-b-1-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-1-image id: vdu-b-1-image name: VNF-B image name: VNF-B image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B.qcow2' image: 'http://someurl.com/VNF-B.qcow2' virtual-compute-desc: virtual_compute_desc: id: vdu-b-2-vcd id: vdu-b-2-vcd virtual-memory: virtual_memory: size: '6.0' size: '6.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-2-vsd id: vdu-b-2-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-2-image id: vdu-b-2-image name: VNF-B-2 image name: VNF-B-2 image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B-2.qcow2' image: 'http://someurl.com/VNF-B-2.qcow2' int-virtual-link-desc: int_virtual_link_desc: - id: internal-vl - id: internal-vl flavour: flavour: id: internal-vl-flavour id: internal-vl-flavour qos: qos: latency: '1' latency: '1' packet-delay-variation: '1' packet_delay_variation: '1' packet-loss-ratio: '0.05' packet_loss_ratio: '0.05' connectivity-type: connectivity_type: layer-protocol: ethernet layer_protocol: ethernet ext-cpd: ext_cpd: - id: ext-b-left - id: ext-b-left int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: left cpd: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: management cpd: management layer-protocol: ethernet layer_protocol: ethernet - id: ext-b-right - id: ext-b-right int-cpd: int_cpd: vdu-id: vdu-b-2 vdu_id: vdu-b-2 cpd: right cpd: right layer-protocol: ethernet layer_protocol: ethernet df: df: id: normal id: normal vdu-profile: vdu_profile: - id: vdu-b-1 - id: vdu-b-1 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '2' max_number_of_instances: '2' - id: vdu-b-2 - id: vdu-b-2 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '4' max_number_of_instances: '4' instantiation-level: instantiation_level: - id: double - id: double vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '2' number_of_instances: '2' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '2' number_of_instances: '2' - id: single - id: single vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '1' number_of_instances: '1' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '1' number_of_instances: '1' default-instantiation-level: single default_instantiation_level: single lcm-operations-configuration: lcm_operations_configuration: scale-vnf-to-level-op-config: scale_vnf_to_level_op_config: arbitrary-target-levels-supported: 'true' arbitrary_target_levels_supported: 'true' terminate-vnf-op-config: terminate_vnf_op_config: min-graceful-termination: '1' min_graceful_termination: '1' operate-vnf-op-config: operate_vnf_op_config: min-graceful-stop-timeout: '1' min_graceful_stop_timeout: '1' No newline at end of file No newline at end of file SOL005/VNFPackageManagement-API/environment/variables.txt +1 −1 Original line number Original line Diff line number Diff line Loading @@ -88,7 +88,7 @@ ${callbackResp} 127.0.0.1 ${descriptorType} SOL001 ${descriptorType} SOL001 ${vnfKey} {} ${vnfKey} {} ${check_descriptors} 1 ${check_descriptors} 1 # If True test suite will validate VNF/NS descriptors ${descriptor_id} ${descriptor_id} ${provider} ${provider} Loading Loading
SOL005/NSLifecycleManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml +41 −41 Original line number Original line Diff line number Diff line Loading @@ -15,44 +15,6 @@ topology_template: virtual_link_right: virtual_link_right: [right, virtual_link_right] [right, virtual_link_right] node_templates: 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: right: type: "tosca.nodes.nfv.VduCp" type: "tosca.nodes.nfv.VduCp" properties: properties: Loading Loading @@ -101,7 +63,7 @@ topology_template: requirements: requirements: - virtual_binding: VDU-B-2 - virtual_binding: VDU-B-2 - virtual_link: internal_vl - virtual_link: internal_vl vdu-b-1-vsd: vdu_b_1_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: Loading @@ -122,14 +84,14 @@ topology_template: sw_image: sw_image: type: "tosca.artifacts.nfv.SwImage" type: "tosca.artifacts.nfv.SwImage" file: vdu-b-1.qcow2 file: vdu-b-1.qcow2 vdu-b-1-vsd: vdu_b_2_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: size_of_storage: 20 size_of_storage: 20 rdma_enabled: false rdma_enabled: false sw_image_data: sw_image_data: name: "vdu-b-1 image" name: "vdu-b-2 image" version: "1.1" version: "1.1" checksum: checksum: algorithm: "sha-224" algorithm: "sha-224" Loading Loading @@ -166,3 +128,41 @@ topology_template: implementation: terminate-example.yaml implementation: terminate-example.yaml operate: operate: implementation: operate-example.yaml 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
SOL005/NSLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml +92 −93 Original line number Original line Diff line number Diff line Loading @@ -2,137 +2,136 @@ nfv: vnfd: vnfd: - id: VNF-B-2vdu - id: VNF-B-2vdu provider: ETSI TST WG provider: ETSI TST WG product-name: TST010 reference VNF-B with 2 VDUs product_name: TST010 reference VNF-B with 2 VDUs software-version: '2.2' software_version: '2.2' version: '2.2' version: '2.2' vnfm-info: ETSI VNFM vnfm_info: ETSI VNFM vdu: vdu: id: vdu-b-1 - id: vdu-b-1 name: VNF-B VDU 1 name: VNF-B VDU 1 int-cpd: int_cpd: - id: left - id: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-1-vcd virtual_compute_desc: vdu-b-1-vcd virtual-storage-desc: vdu-b-1-vsd virtual_storage_desc: vdu-b-1-vsd sw-image-desc: vdu-b-1-image sw_image_desc: vdu-b-1-image vdu: - id: vdu-b-2 id: vdu-b-2 name: VNF-B VDU 2 name: VNF-B VDU 2 int-cpd: int_cpd: - id: right - id: right layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-2-vcd virtual_compute_desc: vdu-b-2-vcd virtual-storage-desc: vdu-b-2-vsd virtual_storage_desc: vdu-b-2-vsd sw-image-desc: vdu-b-2-image sw_image_desc: vdu-b-2-image virtual-compute-desc: virtual_compute_desc: id: vdu-b-1-vcd id: vdu-b-1-vcd virtual-memory: virtual_memory: size: '4.0' size: '4.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-1-vsd id: vdu-b-1-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-1-image id: vdu-b-1-image name: VNF-B image name: VNF-B image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B.qcow2' image: 'http://someurl.com/VNF-B.qcow2' virtual-compute-desc: virtual_compute_desc: id: vdu-b-2-vcd id: vdu-b-2-vcd virtual-memory: virtual_memory: size: '6.0' size: '6.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-2-vsd id: vdu-b-2-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-2-image id: vdu-b-2-image name: VNF-B-2 image name: VNF-B-2 image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B-2.qcow2' image: 'http://someurl.com/VNF-B-2.qcow2' int-virtual-link-desc: int_virtual_link_desc: - id: internal-vl - id: internal-vl flavour: flavour: id: internal-vl-flavour id: internal-vl-flavour qos: qos: latency: '1' latency: '1' packet-delay-variation: '1' packet_delay_variation: '1' packet-loss-ratio: '0.05' packet_loss_ratio: '0.05' connectivity-type: connectivity_type: layer-protocol: ethernet layer_protocol: ethernet ext-cpd: ext_cpd: - id: ext-b-left - id: ext-b-left int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: left cpd: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: management cpd: management layer-protocol: ethernet layer_protocol: ethernet - id: ext-b-right - id: ext-b-right int-cpd: int_cpd: vdu-id: vdu-b-2 vdu_id: vdu-b-2 cpd: right cpd: right layer-protocol: ethernet layer_protocol: ethernet df: df: id: normal id: normal vdu-profile: vdu_profile: - id: vdu-b-1 - id: vdu-b-1 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '2' max_number_of_instances: '2' - id: vdu-b-2 - id: vdu-b-2 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '4' max_number_of_instances: '4' instantiation-level: instantiation_level: - id: double - id: double vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '2' number_of_instances: '2' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '2' number_of_instances: '2' - id: single - id: single vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '1' number_of_instances: '1' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '1' number_of_instances: '1' default-instantiation-level: single default_instantiation_level: single lcm-operations-configuration: lcm_operations_configuration: scale-vnf-to-level-op-config: scale_vnf_to_level_op_config: arbitrary-target-levels-supported: 'true' arbitrary_target_levels_supported: 'true' terminate-vnf-op-config: terminate_vnf_op_config: min-graceful-termination: '1' min_graceful_termination: '1' operate-vnf-op-config: operate_vnf_op_config: min-graceful-stop-timeout: '1' min_graceful_stop_timeout: '1' No newline at end of file No newline at end of file
SOL005/VNFPackageManagement-API/descriptors/SOL001/reference_tst010_vnf_b_2vdu_SOL001.yaml +41 −41 Original line number Original line Diff line number Diff line Loading @@ -15,44 +15,6 @@ topology_template: virtual_link_right: virtual_link_right: [right, virtual_link_right] [right, virtual_link_right] node_templates: 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: right: type: "tosca.nodes.nfv.VduCp" type: "tosca.nodes.nfv.VduCp" properties: properties: Loading Loading @@ -101,7 +63,7 @@ topology_template: requirements: requirements: - virtual_binding: VDU-B-2 - virtual_binding: VDU-B-2 - virtual_link: internal_vl - virtual_link: internal_vl vdu-b-1-vsd: vdu_b_1_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: Loading @@ -122,14 +84,14 @@ topology_template: sw_image: sw_image: type: "tosca.artifacts.nfv.SwImage" type: "tosca.artifacts.nfv.SwImage" file: vdu-b-1.qcow2 file: vdu-b-1.qcow2 vdu-b-1-vsd: vdu_b_2_vsd: type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage" properties: properties: virtual_block_storage_data: virtual_block_storage_data: size_of_storage: 20 size_of_storage: 20 rdma_enabled: false rdma_enabled: false sw_image_data: sw_image_data: name: "vdu-b-1 image" name: "vdu-b-2 image" version: "1.1" version: "1.1" checksum: checksum: algorithm: "sha-224" algorithm: "sha-224" Loading Loading @@ -166,3 +128,41 @@ topology_template: implementation: terminate-example.yaml implementation: terminate-example.yaml operate: operate: implementation: operate-example.yaml 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
SOL005/VNFPackageManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2vdu_SOL006.yaml +92 −93 Original line number Original line Diff line number Diff line Loading @@ -2,137 +2,136 @@ nfv: vnfd: vnfd: - id: VNF-B-2vdu - id: VNF-B-2vdu provider: ETSI TST WG provider: ETSI TST WG product-name: TST010 reference VNF-B with 2 VDUs product_name: TST010 reference VNF-B with 2 VDUs software-version: '2.2' software_version: '2.2' version: '2.2' version: '2.2' vnfm-info: ETSI VNFM vnfm_info: ETSI VNFM vdu: vdu: id: vdu-b-1 - id: vdu-b-1 name: VNF-B VDU 1 name: VNF-B VDU 1 int-cpd: int_cpd: - id: left - id: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-1-vcd virtual_compute_desc: vdu-b-1-vcd virtual-storage-desc: vdu-b-1-vsd virtual_storage_desc: vdu-b-1-vsd sw-image-desc: vdu-b-1-image sw_image_desc: vdu-b-1-image vdu: - id: vdu-b-2 id: vdu-b-2 name: VNF-B VDU 2 name: VNF-B VDU 2 int-cpd: int_cpd: - id: right - id: right layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management layer-protocol: ethernet layer_protocol: ethernet - id: internal - id: internal layer-protocol: ethernet layer_protocol: ethernet int-virtual-link-desc: internal-vl int_virtual_link_desc: internal-vl virtual-compute-desc: vdu-b-2-vcd virtual_compute_desc: vdu-b-2-vcd virtual-storage-desc: vdu-b-2-vsd virtual_storage_desc: vdu-b-2-vsd sw-image-desc: vdu-b-2-image sw_image_desc: vdu-b-2-image virtual-compute-desc: virtual_compute_desc: id: vdu-b-1-vcd id: vdu-b-1-vcd virtual-memory: virtual_memory: size: '4.0' size: '4.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-1-vsd id: vdu-b-1-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-1-image id: vdu-b-1-image name: VNF-B image name: VNF-B image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B.qcow2' image: 'http://someurl.com/VNF-B.qcow2' virtual-compute-desc: virtual_compute_desc: id: vdu-b-2-vcd id: vdu-b-2-vcd virtual-memory: virtual_memory: size: '6.0' size: '6.0' virtual-cpu: virtual_cpu: num-virtual-cpu: '2' num_virtual_cpu: '2' virtual-storage-desc: virtual_storage_desc: id: vdu-b-2-vsd id: vdu-b-2-vsd type-of-storage: root-storage type_of_storage: root-storage size-of-storage: '0' size_of_storage: '0' sw-image-desc: sw_image_desc: id: vdu-b-2-image id: vdu-b-2-image name: VNF-B-2 image name: VNF-B-2 image version: '1.1' version: '1.1' checksum: checksum: algorithm: sha-224 algorithm: sha-224 hash: somehashfortst010 hash: somehashfortst010 container-format: bare container_format: bare disk-format: qcow2 disk_format: qcow2 min-disk: '1' min_disk: '1' min-ram: '2.0' min_ram: '2.0' size: '1' size: '1' image: 'http://someurl.com/VNF-B-2.qcow2' image: 'http://someurl.com/VNF-B-2.qcow2' int-virtual-link-desc: int_virtual_link_desc: - id: internal-vl - id: internal-vl flavour: flavour: id: internal-vl-flavour id: internal-vl-flavour qos: qos: latency: '1' latency: '1' packet-delay-variation: '1' packet_delay_variation: '1' packet-loss-ratio: '0.05' packet_loss_ratio: '0.05' connectivity-type: connectivity_type: layer-protocol: ethernet layer_protocol: ethernet ext-cpd: ext_cpd: - id: ext-b-left - id: ext-b-left int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: left cpd: left layer-protocol: ethernet layer_protocol: ethernet - id: management - id: management int-cpd: int_cpd: vdu-id: vdu-b-1 vdu_id: vdu-b-1 cpd: management cpd: management layer-protocol: ethernet layer_protocol: ethernet - id: ext-b-right - id: ext-b-right int-cpd: int_cpd: vdu-id: vdu-b-2 vdu_id: vdu-b-2 cpd: right cpd: right layer-protocol: ethernet layer_protocol: ethernet df: df: id: normal id: normal vdu-profile: vdu_profile: - id: vdu-b-1 - id: vdu-b-1 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '2' max_number_of_instances: '2' - id: vdu-b-2 - id: vdu-b-2 min-number-of-instances: '1' min_number_of_instances: '1' max-number-of-instances: '4' max_number_of_instances: '4' instantiation-level: instantiation_level: - id: double - id: double vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '2' number_of_instances: '2' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '2' number_of_instances: '2' - id: single - id: single vdu-level: vdu_level: - vdu-id: vdu-b-1 - vdu_id: vdu-b-1 number-of-instances: '1' number_of_instances: '1' - vdu-id: vdu-b-2 - vdu_id: vdu-b-2 number-of-instances: '1' number_of_instances: '1' default-instantiation-level: single default_instantiation_level: single lcm-operations-configuration: lcm_operations_configuration: scale-vnf-to-level-op-config: scale_vnf_to_level_op_config: arbitrary-target-levels-supported: 'true' arbitrary_target_levels_supported: 'true' terminate-vnf-op-config: terminate_vnf_op_config: min-graceful-termination: '1' min_graceful_termination: '1' operate-vnf-op-config: operate_vnf_op_config: min-graceful-stop-timeout: '1' min_graceful_stop_timeout: '1' No newline at end of file No newline at end of file
SOL005/VNFPackageManagement-API/environment/variables.txt +1 −1 Original line number Original line Diff line number Diff line Loading @@ -88,7 +88,7 @@ ${callbackResp} 127.0.0.1 ${descriptorType} SOL001 ${descriptorType} SOL001 ${vnfKey} {} ${vnfKey} {} ${check_descriptors} 1 ${check_descriptors} 1 # If True test suite will validate VNF/NS descriptors ${descriptor_id} ${descriptor_id} ${provider} ${provider} Loading