diff options
| -rw-r--r-- | resources/libraries/python/SchedUtils.py | 104 | ||||
| -rw-r--r-- | resources/libraries/robot/default.robot | 24 | ||||
| -rw-r--r-- | tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot | 21 | ||||
| -rw-r--r-- | tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot | 21 | ||||
| -rw-r--r-- | tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot | 21 |
5 files changed, 177 insertions, 14 deletions
diff --git a/resources/libraries/python/SchedUtils.py b/resources/libraries/python/SchedUtils.py new file mode 100644 index 0000000000..ec18b98dac --- /dev/null +++ b/resources/libraries/python/SchedUtils.py @@ -0,0 +1,104 @@ +# 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. + +"""Linux scheduler util library""" +from resources.libraries.python.ssh import SSH + + +__all__ = ["SchedUtils"] + +class SchedUtils(object): + """General class for any linux scheduler related methods/functions.""" + + @staticmethod + def set_vpp_scheduling_rr(node): + """Set real-time scheduling attributes of VPP worker threads to + SCHED_RR with priority 1. + + :param node: DUT node with running VPP. + :type node: dict + :raises RuntimeError: Failed to retrieve PID for VPP worker threads. + """ + ssh = SSH() + ssh.connect(node) + + cmd = "cat /proc/`pidof vpp`/task/*/stat | grep -i vpp_wk"\ + " | awk '{print $1}'" + + for _ in range(3): + (ret, out, _) = ssh.exec_command_sudo(cmd) + if ret == 0: + try: + if not out: + raise ValueError + except ValueError: + print 'Reading VPP worker thread PID failed.' + else: + for pid in out.split("\n"): + if len(pid) > 0 and pid[0] != "#": + SchedUtils.set_proc_scheduling_rr(node, int(pid)) + break + else: + raise RuntimeError('Failed to retrieve PID for VPP worker threads.') + + @staticmethod + def set_proc_scheduling_rr(node, pid, priority=1): + """Set real-time scheduling of a process to SCHED_RR with priority for + specified PID. + + :param node: Node where to apply scheduling changes. + :param pid: Process ID. + :param priority: Realtime priority in range 1-99. Default is 1. + :type node: dict + :type pid: int + :type priority: int + :raises ValueError: Parameters out of allowed ranges. + :raises RuntimeError: Failed to set policy for PID. + """ + ssh = SSH() + ssh.connect(node) + + if pid < 1: + raise ValueError("SCHED_RR: PID must be higher then 1.") + + if 1 <= priority <= 99: + cmd = "chrt -r -p {0} {1}".format(priority, pid) + (ret, _, _) = ssh.exec_command_sudo(cmd) + if ret != 0: + raise RuntimeError("SCHED_RR: Failed to set policy "\ + "for PID {0}.".format(pid)) + else: + raise ValueError("SCHED_RR: Priority must be in range 1-99.") + + @staticmethod + def set_proc_scheduling_other(node, pid): + """Set normal scheduling of a process to SCHED_OTHER for specified PID. + + :param node: Node where to apply scheduling changes. + :param pid: Process ID. + :type node: dict + :type pid: int + :raises ValueError: Parameters out of allowed ranges. + :raises RuntimeError: Failed to set policy for PID. + """ + ssh = SSH() + ssh.connect(node) + + if pid < 1: + raise ValueError("SCHED_OTHER: PID must be higher then 1.") + + cmd = "chrt -o -p 0 {1}".format(pid) + (ret, _, _) = ssh.exec_command_sudo(cmd) + if ret != 0: + raise RuntimeError("SCHED_OTHER: Failed to set policy "\ + "for PID {0}.".format(pid)) diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot index dca7d53373..85cc4102cc 100644 --- a/resources/libraries/robot/default.robot +++ b/resources/libraries/robot/default.robot @@ -16,6 +16,7 @@ | Library | resources.libraries.python.topology.Topology | Library | resources.libraries.python.CpuUtils | Library | resources.libraries.python.DUTSetup +| Library | resources.libraries.python.SchedUtils | Library | resources.libraries.python.TGSetup | Library | resources/libraries/python/VppConfigGenerator.py | Library | resources/libraries/python/VppCounters.py @@ -23,27 +24,27 @@ *** Keywords *** | Setup all DUTs before test -| | [Documentation] | Setup all DUTs in topology before test execution +| | [Documentation] | Setup all DUTs in topology before test execution. | | Setup All DUTs | ${nodes} | Setup all TGs before traffic script -| | [Documentation] | Prepare all TGs before traffic scripts execution +| | [Documentation] | Prepare all TGs before traffic scripts execution. | | All TGs Set Interface Default Driver | ${nodes} -| Show vpp version on all DUTs -| | [Documentation] | Show VPP version verbose on all DUTs +| Show Vpp Version On All DUTs +| | [Documentation] | Show VPP version verbose on all DUTs. | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Vpp show version verbose | ${nodes['${dut}']} -| Show Vpp Errors on All DUTs -| | [Documentation] | Show VPP errors verbose on all DUTs +| Show Vpp Errors On All DUTs +| | [Documentation] | Show VPP errors verbose on all DUTs. | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Vpp Show Errors | ${nodes['${dut}']} -| Show vpp trace dump on all DUTs -| | [Documentation] | Save API trace and dump output on all DUTs +| Show Vpp Trace Dump On All DUTs +| | [Documentation] | Save API trace and dump output on all DUTs. | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Vpp api trace save | ${nodes['${dut}']} @@ -55,6 +56,13 @@ | | :FOR | ${dut} | IN | @{duts} | | | Vpp Show Vhost | ${nodes['${dut}']} +| Setup Scheduler Policy for Vpp On All DUTs +| | [Documentation] | Set realtime scheduling policy (SCHED_RR) with priority 1 +| | ... | on all VPP worker threads on all DUTs. +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Set VPP Scheduling rr | ${nodes['${dut}']} + | Add '${m}' worker threads and rxqueues '${n}' in 3-node single-link topo | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup | | ... | configuration on all DUTs in 3-node single-link topology. diff --git a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot index 1019152ce1..3764b7af11 100644 --- a/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot +++ b/tests/perf/Long_Bridge_Domain_Vhost_Intel-X520-DA2.robot @@ -16,9 +16,8 @@ | Library | resources.libraries.python.QemuUtils | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG | ... | PERFTEST_VHOST | NIC_Intel-X520-DA2 -| Suite Setup | Run Keywords | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| ... | AND | Kill QEMU on all DUTs | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test | Test Teardown | Run Keywords @@ -95,6 +94,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -126,6 +126,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -159,6 +160,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -190,6 +192,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -224,6 +227,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -255,6 +259,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -288,6 +293,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -319,6 +325,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -352,6 +359,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -383,6 +391,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -417,6 +426,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -449,6 +459,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -482,6 +493,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -513,6 +525,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -546,6 +559,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -577,6 +591,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -611,6 +626,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -643,6 +659,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} diff --git a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot index a492caed57..2d29d48c48 100644 --- a/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot +++ b/tests/perf/Long_IPv4_Vhost_Intel-X520-DA2.robot @@ -16,9 +16,8 @@ | Library | resources.libraries.python.QemuUtils | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG | ... | PERFTEST_VHOST | NIC_Intel-X520-DA2 -| Suite Setup | Run Keywords | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| ... | AND | Kill QEMU on all DUTs | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test | Test Teardown | Run Keywords @@ -96,6 +95,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -129,6 +129,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -164,6 +165,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -197,6 +199,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -233,6 +236,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -266,6 +270,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -301,6 +306,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -334,6 +340,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -369,6 +376,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -402,6 +410,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -438,6 +447,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -472,6 +482,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -507,6 +518,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -540,6 +552,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -575,6 +588,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -608,6 +622,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -644,6 +659,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} @@ -678,6 +694,7 @@ | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-IPv4 | | ... | ${min_rate} | ${max_rate} diff --git a/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot index 6c9896928c..6eb8547fea 100644 --- a/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot +++ b/tests/perf/Long_Xconnect_Vhost_Intel-X520-DA2.robot @@ -16,9 +16,8 @@ | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG | ... | PERFTEST_VHOST | NIC_Intel-X520-DA2 -| Suite Setup | Run Keywords | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| ... | AND | Kill QEMU on all DUTs | Suite Teardown | 3-node Performance Suite Teardown | Test Setup | Setup all DUTs before test | Test Teardown | Run Keywords @@ -93,6 +92,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -124,6 +124,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -157,6 +158,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -188,6 +190,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -222,6 +225,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -254,6 +258,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -287,6 +292,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -318,6 +324,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -351,6 +358,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -382,6 +390,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -416,6 +425,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -448,6 +458,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -481,6 +492,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -512,6 +524,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -545,6 +558,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -576,6 +590,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -610,6 +625,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} @@ -642,6 +658,7 @@ | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} +| | And Setup scheduler policy for VPP on all DUTs | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | 3-node-bridge | | ... | ${min_rate} | ${max_rate} |