diff options
Diffstat (limited to 'resources/libraries/robot')
6 files changed, 129 insertions, 252 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index cf287c2af6..d4819ff9c4 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -32,7 +32,6 @@ | Resource | resources/libraries/robot/l2/l2_patch.robot | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/ip/ip6.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/l2/tagging.robot | Resource | resources/libraries/robot/overlay/srv6.robot | Documentation | Performance suite keywords - configuration. @@ -2321,40 +2320,32 @@ | | ... | \| DUT1_VM2 \| qemu_id=${2} \| | | ... | | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${nf_cpus} -| | ... | ${qemu_id}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} +| | ... | ${qemu_id}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} | | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True} | | ... +| | ${apply_patch}= | Set Variable | ${False} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin +| | ... | ${perf_qemu_path}-base/bin | | ${nf_cpus_count}= | Get Length | ${nf_cpus} | | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} | | ... | Set Variable | ${rxq_count_int} | | ... | ELSE | Set Variable | ${1} -| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} +| | Import Library | resources.libraries.python.QemuUtils | ${nodes['${dut}']} +| | ... | qemu_id=${qemu_id} | smp=${nf_cpus_count} | mem=${2048} +| | ... | img=${perf_vm_image} | bin_path=${perf_qemu_path} | | ... | WITH NAME | ${vm_name} -| | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']} -| | ${serial_port}= | Evaluate | ${qemu_id} + ${4555} -| | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port} -| | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021} -| | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port} -| | Run keyword | ${vm_name}.Qemu Set Queue Count | ${rxq_count_int} -| | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz} -| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} -| | ... | jumbo_frames=${jumbo} -| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} -| | ... | jumbo_frames=${jumbo} -| | ${apply_patch}= | Set Variable | ${False} -| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} -| | ... | ${perf_qemu_path}-patch/bin/ -| | ... | ${perf_qemu_path}-base/bin/ +| | Run Keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} +| | Run Keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} | | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${nodes['${dut}']} | | ... | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} -| | Run keyword | ${vm_name}.Qemu Set Smp | ${nf_cpus_count} | ${nf_cpus_count} -| | ... | 1 | 1 -| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image} -| | ${vm}= | Run keyword | ${vm_name}.Qemu Start -| | Run keyword | ${vm_name}.Qemu Set Affinity | @{nf_cpus} -| | Run keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy +| | ${vm}= | Run Keyword | ${vm_name}.Qemu Start +| | Run Keyword | ${vm_name}.Qemu Set Affinity | @{nf_cpus} +| | Run Keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy | | ${max_pkt_len}= | Set Variable If | ${jumbo} | 9200 | ${EMPTY} | | ${testpmd_cpus}= | Cpu list per node str | ${nodes['${dut}']} | ${0} | | ... | cpu_cnt=${nf_cpus_count} @@ -2382,10 +2373,10 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd connected via \ -| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 256 \| +| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 1024 \| | | ... | | [Arguments] | ${dut} | ${vm_count}=${1} | ${jumbo}=${False} | -| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 | | | ${nf_cpus}= | Create network function CPU list | ${dut} @@ -2395,10 +2386,11 @@ | | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 | | | ${vm}= | | | ... | Configure guest VM with dpdk-testpmd connected via vhost-user -| | | ... | ${dut} | ${sock1} | ${sock2} | ${dut}_VM${number} +| | | ... | ${dut} | ${sock1} | ${sock2} | ${TEST NAME}${dut}_VM${number} | | | ... | ${nf_cpus} | qemu_id=${number} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs} -| | | Set To Dictionary | ${${dut}_vm_refs} | ${dut}_VM${number} | ${vm} +| | | Set To Dictionary | ${${dut}_vm_refs} | ${TEST NAME}${dut}_VM${number} +| | | ... | ${vm} | Configure guest VMs with dpdk-testpmd connected via vhost-user | | [Documentation] @@ -2417,10 +2409,10 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd connected via vhost-user\ -| | ... | \| 1 \| False \| 256 \| +| | ... | \| 1 \| False \| 1024 \| | | ... -| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} @@ -2467,37 +2459,29 @@ | | ... | | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | | ... | ${eth0_mac} | ${eth1_mac} | ${nf_cpus} | ${qemu_id}=${1} -| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} +| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} | | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True} | | ... +| | ${apply_patch}= | Set Variable | ${False} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin +| | ... | ${perf_qemu_path}-base/bin | | ${nf_cpus_count}= | Get Length | ${nf_cpus} | | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} | | ... | Set Variable | ${rxq_count_int} | | ... | ELSE | Set Variable | ${1} -| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} +| | Import Library | resources.libraries.python.QemuUtils | ${nodes['${dut}']} +| | ... | qemu_id=${qemu_id} | smp=${nf_cpus_count} | mem=${2048} +| | ... | img=${perf_vm_image} | bin_path=${perf_qemu_path} | | ... | WITH NAME | ${vm_name} -| | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']} -| | ${serial_port}= | Evaluate | ${qemu_id} + ${4555} -| | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port} -| | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021} -| | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port} -| | Run keyword | ${vm_name}.Qemu Set Queue Count | ${rxq_count_int} -| | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} -| | ... | jumbo_frames=${jumbo} +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} -| | ... | jumbo_frames=${jumbo} -| | ${apply_patch}= | Set Variable | ${False} -| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} -| | ... | ${perf_qemu_path}-patch/bin/ -| | ... | ${perf_qemu_path}-base/bin/ +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} | | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${nodes['${dut}']} | | ... | apply_patch=${False} -| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} -| | Run keyword | ${vm_name}.Qemu Set Smp | ${nf_cpus_count} | ${nf_cpus_count} -| | ... | 1 | 1 -| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image} | | ${vm}= | Run keyword | ${vm_name}.Qemu Start | | Run keyword | ${vm_name}.Qemu Set Affinity | @{nf_cpus} | | Run keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy @@ -2532,10 +2516,10 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd-mac connected via \ -| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 256 \| +| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 1024 \| | | ... | | [Arguments] | ${dut} | ${vm_count}=${1} | ${jumbo}=${False} | -| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 | | | ${nf_cpus}= | Create network function CPU list | ${dut} @@ -2545,12 +2529,13 @@ | | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 | | | ${vm}= | | | ... | Configure guest VM with dpdk-testpmd-mac connected via vhost-user -| | | ... | ${dut} | ${sock1} | ${sock2} | ${dut}_VM${number} +| | | ... | ${dut} | ${sock1} | ${sock2} | ${TEST NAME}${dut}_VM${number} | | | ... | ${${dut}-vhost-${number}-if1_mac} | | | ... | ${${dut}-vhost-${number}-if2_mac} | nf_cpus=${nf_cpus} | | | ... | qemu_id=${number} | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz} | | | ... | use_tuned_cfs=${use_tuned_cfs} -| | | Set To Dictionary | ${${dut}_vm_refs} | ${dut}_VM${number} | ${vm} +| | | Set To Dictionary | ${${dut}_vm_refs} | ${TEST NAME}${dut}_VM${number} +| | | ... | ${vm} | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user | | [Documentation] @@ -2569,10 +2554,10 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd-mac connected via vhost-user\ -| | ... | \| 1 \| False \| 256 \| +| | ... | \| 1 \| False \| 1024 \| | | ... -| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} @@ -2604,10 +2589,10 @@ | | ... | *Example:* | | ... | | ... | \| Configure chain of NFs with dpdk-testpmd-mac connected via \ -| | ... | vhost-user on node \| DUT1 \| 1 \| 1 \| 1 \| False \| 256 \| +| | ... | vhost-user on node \| DUT1 \| 1 \| 1 \| 1 \| False \| 1024 \| | | ... | | [Arguments] | ${dut} | ${nf_chains}=${1} | ${nf_chain}=${1} -| | ... | ${nf_nodes}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} +| | ... | ${nf_nodes}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} | | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${False} | | ... | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} @@ -2661,10 +2646,10 @@ | | ... | *Example:* | | ... | | ... | \| Configure chain of NFs with dpdk-testpmd-mac connected via\ -| | ... | vhost-user \| 1 \| 1 \| 1 \| False \| 256 \| +| | ... | vhost-user \| 1 \| 1 \| 1 \| False \| 1024 \| | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_chain}=${1} | ${nf_nodes}=${1} -| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} +| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} | | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${False} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* @@ -2695,10 +2680,10 @@ | | ... | *Example:* | | ... | | ... | \| Configure chains of VMs with dpdk-testpmd-mac connected via \ -| | ... | vhost-user \| 1 \| 1 \| False \| 256 \| +| | ... | vhost-user \| 1 \| 1 \| False \| 1024 \| | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${jumbo}=${False} -| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | ${auto_scale}=${False} | | ... | | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot index 98f6310510..98adf6df9d 100644 --- a/resources/libraries/robot/performance/performance_setup.robot +++ b/resources/libraries/robot/performance/performance_setup.robot @@ -221,8 +221,6 @@ | | | ${vm}= | Get From Dictionary | ${dut_vm_refs} | ${vm_name} | | | ${index}= | Evaluate | ${index} + 1 | | | Dpdk Testpmd Stop | ${vm} -| | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node} -| | | Run Keyword | ${vm_name}.Qemu Clear Socks | | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All | Tear down guest VM @@ -245,8 +243,6 @@ | | :FOR | ${vm_name} | IN | @{dut_vm_refs} | | | ${vm}= | Get From Dictionary | ${dut_vm_refs} | ${vm_name} | | | ${index}= | Evaluate | ${index} + 1 -| | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node} -| | | Run Keyword | ${vm_name}.Qemu Clear Socks | | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All # Suite setups diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot index 480f7e1f33..6ce706a514 100644 --- a/resources/libraries/robot/performance/performance_utils.robot +++ b/resources/libraries/robot/performance/performance_utils.robot @@ -32,7 +32,6 @@ | Resource | resources/libraries/robot/l2/l2_xconnect.robot | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/ip/ip6.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/l2/tagging.robot | Documentation | Performance suite keywords - utilities to find and verify NDR | ... | and PDR. diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 91fde22038..6d99b959d3 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -33,7 +33,6 @@ | Library | resources.libraries.python.topology.Topology | ... | Resource | resources/libraries/robot/shared/container.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Resource | resources/libraries/robot/vm/qemu.robot *** Keywords *** @@ -518,22 +517,13 @@ | | [Documentation] | Common test teardown for functional tests with LISP and\ | | ... | QEMU. | | ... -| | ... | *Arguments:* -| | ... | - vm_node - VM to stop. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Tear down LISP functional test with QEMU \| ${vm_node} \| -| | ... -| | [Arguments] | ${vm_node} -| | ... | | Remove All Added Ports On All DUTs From Topology | ${nodes} | | Show Packet Trace on All DUTs | ${nodes} | | Show PAPI History On All DUTs | ${nodes} | | Show Vpp Settings | ${nodes['DUT1']} | | Show Vpp Settings | ${nodes['DUT2']} | | Vpp Show Errors On All DUTs | ${nodes} -| | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| | Stop and clear QEMU | ${nodes['DUT1']} | | Verify VPP PID in Teardown | Set up TAP functional test @@ -609,21 +599,17 @@ | | ... | | ... | *Arguments:* | | ... | - dut1_node - Node Nr.1 where to clean qemu. Type: dictionary -| | ... | - qemu_node1 - VM Nr.1 node info dictionary. Type: string | | ... | - dut2_node - Node Nr.2 where to clean qemu. Type: dictionary -| | ... | - qemu_node2 - VM Nr.2 node info dictionary. Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${qemu_node1}\ -| | ... | \| ${dut2_node} \| ${qemu_node2} \| +| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${dut2_node} \| | | ... -| | [Arguments] | ${dut1_node} | ${qemu_node1} | ${dut2_node} -| | ... | ${qemu_node2} +| | [Arguments] | ${dut1_node} | ${dut2_node} | | ... | | Tear down functional test -| | Tear down QEMU | ${dut1_node} | ${qemu_node1} | qemu_node1 -| | Tear down QEMU | ${dut2_node} | ${qemu_node2} | qemu_node2 +| | Tear down QEMU | ${dut1_node} | qemu_node1 +| | Tear down QEMU | ${dut2_node} | qemu_node2 | Tear down functional test with container | | [Documentation] diff --git a/resources/libraries/robot/vm/double_qemu_setup.robot b/resources/libraries/robot/vm/double_qemu_setup.robot deleted file mode 100644 index 377e222804..0000000000 --- a/resources/libraries/robot/vm/double_qemu_setup.robot +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -*** Settings *** -| Library | resources.libraries.python.IPUtil - -*** Keywords *** -| Configure QEMU vhost and run it -| | [Documentation] | Setup Qemu with 4 vhost-user interfaces and 4 namespaces. -| | ... | Each call will be different object instance. -| | ... -| | ... | *Arguments:* -| | ... | - dut_node - Node where to setup qemu. Type: dict -| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string -| | ... | - sock3 - Socket path for third Vhost-User interface. Type: string -| | ... | - sock4 - Socket path for forth Vhost-User interface. Type: string -| | ... | - ip1 - IP address for namespace 1. Type: string -| | ... | - ip2 - IP address for namespace 2. Type: string -| | ... | - ip3 - IP address for namespace 3. Type: string -| | ... | - ip4 - IP address for namespace 4. Type: string -| | ... | - prefix_length - IP prefix length. Type: int -| | ... | - qemu_name - Qemu instance name by which the object will be accessed. -| | ... | Type: string -| | ... | - mac_ID - MAC address ID used to differentiate qemu instances and -| | ... | namespaces assigned to them. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Setup QEMU Vhost And Run\| {nodes['DUT1']} \| /tmp/sock1 \ -| | ... | \| /tmp/sock2 \| /tmp/sock3 \| /tmp/sock4 \| 16.0.0.1 \| 16.0.0.2 \ -| | ... | \| 16.0.0.3 \| 16.0.0.4 \| 24 \| qemu_instance_1 \| 06 \| -| | ... -| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${sock3} | ${sock4} -| | ... | ${ip1} | ${ip2} | ${ip3} | ${ip4} | ${prefix_length} -| | ... | ${qemu_name} | ${mac_ID} -| | Import Library | resources.libraries.python.QemuUtils \ -| | ... | WITH NAME | ${qemu_name} -| | ${qemu_add_vhost}= | Replace Variables | ${qemu_name}.Qemu Add Vhost User If -| | ${qemu_set_node}= | Replace Variables | ${qemu_name}.Qemu Set Node -| | ${qemu_start}= | Replace Variables | ${qemu_name}.Qemu Start -| | Run keyword | ${qemu_add_vhost} | ${sock1} | mac=52:54:00:00:${mac_ID}:01 -| | Run keyword | ${qemu_add_vhost} | ${sock2} | mac=52:54:00:00:${mac_ID}:02 -| | Run keyword | ${qemu_add_vhost} | ${sock3} | mac=52:54:00:00:${mac_ID}:03 -| | Run keyword | ${qemu_add_vhost} | ${sock4} | mac=52:54:00:00:${mac_ID}:04 -| | Run keyword | ${qemu_set_node} | ${dut_node} -| | ${vm}= | Run keyword | ${qemu_start} -| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} -| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} -| | ${vhost3}= | Get Vhost User If Name By Sock | ${vm} | ${sock3} -| | ${vhost4}= | Get Vhost User If Name By Sock | ${vm} | ${sock4} -| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name -| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name -| | Set Interface State | ${vm} | ${vhost3} | up | if_type=name -| | Set Interface State | ${vm} | ${vhost4} | up | if_type=name -| | Setup Network Namespace -| | ... | ${vm} | nmspace1 | ${vhost1} | ${ip1} | ${prefix_length} -| | Setup Network Namespace -| | ... | ${vm} | nmspace2 | ${vhost2} | ${ip2} | ${prefix_length} -| | Setup Network Namespace -| | ... | ${vm} | nmspace3 | ${vhost3} | ${ip3} | ${prefix_length} -| | Setup Network Namespace -| | ... | ${vm} | nmspace4 | ${vhost4} | ${ip4} | ${prefix_length} -| | Set Test Variable | ${${qemu_name}} | ${vm} - -| Tear down QEMU -| | [Documentation] | Stop specific qemu instance -| | ... | running on ${dut_node}, ${vm} is VM node info dictionary -| | ... | returned by qemu_start or None. -| | ... | *Arguments:* -| | ... | - dut_node - Node where to clean qemu. Type: dict -| | ... | - vm - VM node info dictionary. Type: string -| | ... | - qemu_name - Qemu instance by name. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Tear down QEMU \| ${node['DUT1']} \| ${vm} \| qemu_node_1 \| -| | ... -| | [Arguments] | ${dut_node} | ${vm} | ${qemu_name} -| | ${set_node}= | Replace Variables | ${qemu_name}.Qemu Set Node -| | ${kill}= | Replace Variables | ${qemu_name}.Qemu Kill -| | ${clear_socks}= | Replace Variables | ${qemu_name}.Qemu Clear Socks -| | Run Keyword | ${set_node} | ${dut_node} -| | Run Keyword | ${kill} -| | Run Keyword | ${clear_socks} -| | Run Keyword If | ${vm} is not None | Disconnect | ${vm} diff --git a/resources/libraries/robot/vm/qemu.robot b/resources/libraries/robot/vm/qemu.robot index 097f3cb1a8..528b7fbe8c 100644 --- a/resources/libraries/robot/vm/qemu.robot +++ b/resources/libraries/robot/vm/qemu.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -11,89 +11,95 @@ # See the License for the specific language governing permissions and # limitations under the License. *** Settings *** +| Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.QemuUtils -| Library | resources.libraries.python.ssh.SSH *** Keywords *** - -| QEMU build list should exist -| | [Documentation] | Return TRUE if variable QEMU_BUILD exist, otherwise FALSE -| | ${ret} | ${tmp}= | Run Keyword And Ignore Error -| | ... | Variable Should Exist | @{QEMU_BUILD} -| | Return From Keyword If | "${ret}" == "PASS" | ${TRUE} -| | Return From Keyword | ${FALSE} - -| Is QEMU ready on node -| | [Documentation] | Check if QEMU was built on the node before -| | [Arguments] | ${node} -| | ${ret}= | QEMU build list should exist -| | Return From Keyword If | ${ret} == ${FALSE} | ${FALSE} -| | ${ret} | ${tmp}= | Run Keyword And Ignore Error -| | ... | Should Contain | ${QEMU_BUILD} | ${node['host']} -| | Return From Keyword If | "${ret}" == "PASS" | ${TRUE} -| | Return From Keyword | ${FALSE} - -| Add node to QEMU build list -| | [Documentation] | Add node to the list of nodes with builded QEMU (global -| | ... | variable QEMU_BUILD) -| | [Arguments] | ${node} -| | ${ret}= | QEMU build list should exist -| | Run Keyword If | ${ret} == ${TRUE} -| | ... | Append To List | ${QEMU_BUILD} | ${node['host']} -| | ... | ELSE | Set Global Variable | @{QEMU_BUILD} | ${node['host']} - -| Build QEMU on node -| | [Documentation] | Build QEMU from sources on the Node. Nodes with successful -| | ... | QEMU build are stored in global variable list QEMU_BUILD +| Configure QEMU vhost and run it +| | [Documentation] +| | ... | Setup Qemu with 4 vhost-user interfaces and 4 namespaces. +| | ... | Each call will be different object instance. | | ... | | ... | *Arguments:* -| | ... | - node - Node on which to build qemu. Type: dictionary -| | ... | - force_install - If True, then remove previous build. Type: bool -| | ... | - apply_patch - If True, then apply patches from qemu_patches dir. -| | ... | Type: bool +| | ... | - dut_node - Node where to setup qemu. Type: dict +| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string +| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string +| | ... | - sock3 - Socket path for third Vhost-User interface. Type: string +| | ... | - sock4 - Socket path for forth Vhost-User interface. Type: string +| | ... | - ip1 - IP address for namespace 1. Type: string +| | ... | - ip2 - IP address for namespace 2. Type: string +| | ... | - ip3 - IP address for namespace 3. Type: string +| | ... | - ip4 - IP address for namespace 4. Type: string +| | ... | - prefix_length - IP prefix length. Type: int +| | ... | - qemu_name - Qemu instance name by which the object will be accessed. +| | ... | Type: string +| | ... | - mac_ID - MAC address ID used to differentiate qemu instances and +| | ... | namespaces assigned to them. Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Build QEMU on node \| ${node['DUT1']} \| False \| False \| +| | ... | \| Setup QEMU Vhost And Run\| {nodes['DUT1']} \| /tmp/sock1 \ +| | ... | \| /tmp/sock2 \| /tmp/sock3 \| /tmp/sock4 \| 16.0.0.1 \| 16.0.0.2 \ +| | ... | \| 16.0.0.3 \| 16.0.0.4 \| 24 \| qemu_instance_1 \| 06 \| | | ... -| | [Arguments] | ${node} | ${force_install}=${False} | ${apply_patch}=${False} -| | ${ready}= | Is QEMU ready on node | ${node} -| | Return From Keyword If | ${ready} == ${TRUE} -| | Build QEMU | ${node} -| | Add node to QEMU build list | ${node} +| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${sock3} | ${sock4} +| | ... | ${ip1} | ${ip2} | ${ip3} | ${ip4} | ${prefix_length} +| | ... | ${qemu_name} | ${mac_ID}=${None} +| | ... +| | Import Library | resources.libraries.python.QemuUtils \ +| | ... | node=${dut_node} | WITH NAME | ${qemu_name} +| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock1} +| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock2} +| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock3} +| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock4} +| | ${vm}= | Run keyword | ${qemu_name}.Qemu Start +| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} +| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} +| | ${vhost3}= | Get Vhost User If Name By Sock | ${vm} | ${sock3} +| | ${vhost4}= | Get Vhost User If Name By Sock | ${vm} | ${sock4} +| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost3} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost4} | up | if_type=name +| | Setup Network Namespace +| | ... | ${vm} | nmspace1 | ${vhost1} | ${ip1} | ${prefix_length} +| | Setup Network Namespace +| | ... | ${vm} | nmspace2 | ${vhost2} | ${ip2} | ${prefix_length} +| | Setup Network Namespace +| | ... | ${vm} | nmspace3 | ${vhost3} | ${ip3} | ${prefix_length} +| | Setup Network Namespace +| | ... | ${vm} | nmspace4 | ${vhost4} | ${ip4} | ${prefix_length} +| | Set Test Variable | ${${qemu_name}} | ${vm} -| Build QEMU on all DUTs -| | [Documentation] | Build QEMU from sources on all DUTs. Nodes with successful -| | ... | QEMU build are stored in global variable list QEMU_BUILD +| Tear down QEMU +| | [Documentation] +| | ... | Stop specific qemu instance running on ${dut_node}. | | ... | | ... | *Arguments:* -| | ... | - force_install - If True, then remove previous build. Type: bool -| | ... | - apply_patch - If True, then apply patches from qemu_patches dir. -| | ... | Type: bool +| | ... | - dut_node - Node where to clean qemu. Type: dict +| | ... | - qemu_name - Qemu instance by name. Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Build QEMU on all DUTs \| False \| False \| +| | ... | \| Tear down QEMU \| ${node['DUT1']} \| qemu_node_1 \| +| | ... +| | [Arguments] | ${dut_node} | ${qemu_name} | | ... -| | [Arguments] | ${force_install}=${False} | ${apply_patch}=${False} -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Build QEMU on node | ${nodes['${dut}']} | ${force_install} | -| | | ... | ${apply_patch} +| | Run Keyword | ${qemu_name}.Qemu Set Node | ${dut_node} +| | Run Keyword | ${qemu_name}.Qemu Kill | Stop and clear QEMU -| | [Documentation] | Stop QEMU, clear used sockets and close SSH connection -| | ... | running on ${dut}, ${vm} is VM node info dictionary -| | ... | returned by qemu_start or None. -| | [Arguments] | ${dut} | ${vm} +| | [Documentation] +| | ... | Stop QEMU, clear used sockets running on ${dut}. +| | ... +| | ... | *Arguments:* +| | ... | - dut_node - Node where to clean qemu. Type: dict +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Tear down QEMU \| ${node['DUT1']} \| +| | ... +| | [Arguments] | ${dut} +| | ... | | Qemu Set Node | ${dut} | | Qemu Kill -| | Qemu Clear Socks -| | Run Keyword If | ${vm} is not None | Disconnect | ${vm} - -| Kill Qemu on all DUTs -| | [Documentation] | Kill QEMU processes on all DUTs. -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Qemu Set Node | ${nodes['${dut}']} -| | | Qemu Kill |