aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2016-10-25 10:26:47 +0200
committerPeter Mikus <pmikus@cisco.com>2016-11-04 13:43:06 +0000
commit8184e3073bc98a85709380f55fd18f0c01ac9cf3 (patch)
treed57d88ca912caec2e249e0160b4ed75687362631 /resources
parentcbdce89c2134a8a0ecbba785b8f5ca09ac942a0c (diff)
CSIT-458 Use node aware config in all perf TCs
- Use node aware config in all perf TCs Change-Id: Icbf92bf232efef49d07c1324c64ae55125e90fb2 Signed-off-by: pmikus <pmikus@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/robot/default.robot26
-rw-r--r--resources/libraries/robot/performance.robot4
2 files changed, 3 insertions, 27 deletions
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index 238749aef1..8602f705ef 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -81,30 +81,6 @@
| | Add rxqueues config | ${dut1} | ${rxqueues}
| | Add rxqueues config | ${dut2} | ${rxqueues}
-| Add '${m}' worker threads and rxqueues '${n}' without HTT to all DUTs
-| | [Documentation] | Setup M worker threads without HTT and rxqueues N in
-| | ... | startup configuration of VPP to all DUTs
-| | ${cpu}= | Catenate | main-core | 0 | corelist-workers
-| | ${cpu}= | Run Keyword If | '${m}' == '1' | Catenate | ${cpu} | 1
-| | ... | ELSE IF | '${m}' == '2' | Catenate | ${cpu} | 1-2
-| | ... | ELSE IF | '${m}' == '4' | Catenate | ${cpu} | 1-4
-| | ... | ELSE IF | '${m}' == '6' | Catenate | ${cpu} | 1-6
-| | ... | ELSE | Fail | Not supported combination
-| | ${rxqueues}= | Catenate | num-rx-queues | ${n}
-| | Add worker threads and rxqueues to all DUTs | ${cpu} | ${rxqueues}
-
-| Add '${m}' worker threads and rxqueues '${n}' with HTT to all DUTs
-| | [Documentation] | Setup M worker threads with HTT and rxqueues N in
-| | ... | startup configuration of VPP to all DUTs
-| | ${cpu}= | Catenate | main-core | 0 | corelist-workers
-| | ${cpu}= | Run Keyword If | '${m}' == '2' | Catenate | ${cpu} | 1,10
-| | ... | ELSE IF | '${m}' == '4' | Catenate | ${cpu} | 1-2,10-11
-| | ... | ELSE IF | '${m}' == '6' | Catenate | ${cpu} | 1-3,10-12
-| | ... | ELSE IF | '${m}' == '8' | Catenate | ${cpu} | 1-4,10-13
-| | ... | ELSE | Fail | Not supported combination
-| | ${rxqueues}= | Catenate | num-rx-queues | ${n}
-| | Add worker threads and rxqueues to all DUTs | ${cpu} | ${rxqueues}
-
| Add worker threads and rxqueues to all DUTs
| | [Documentation] | Setup worker threads and rxqueues in VPP startup
| | ... | configuration to all DUTs
@@ -186,7 +162,7 @@
| Setup default startup configuration of VPP on all DUTs
| | [Documentation] | Setup default startup configuration of VPP to all DUTs
| | Remove startup configuration of VPP from all DUTs
-| | Add '1' worker threads and rxqueues '1' without HTT to all DUTs
+| | Add '1' worker threads and rxqueues '1' in 3-node single-link topo
| | Add all PCI devices to all DUTs
| | Apply startup configuration on all VPP DUTs
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 2c235dddc8..f7cd96aa30 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -676,11 +676,11 @@
| | ...
| | ... | \| 2-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
| | [Arguments] | ${topology_type} | ${nic_model}
-| | Setup default startup configuration of VPP on all DUTs
| | Show vpp version on all DUTs
| | Setup performance global Variables
| | 2-node circular Topology Variables Setup with DUT interface model
| | ... | ${nic_model}
+| | Setup default startup configuration of VPP on all DUTs
| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
| | ... | ${dut1} | ${dut1_if1}
| | ... | ${dut1} | ${dut1_if2}
@@ -701,11 +701,11 @@
| | ...
| | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
| | [Arguments] | ${topology_type} | ${nic_model}
-| | Setup default startup configuration of VPP on all DUTs
| | Show vpp version on all DUTs
| | Setup performance global Variables
| | 3-node circular Topology Variables Setup with DUT interface model
| | ... | ${nic_model}
+| | Setup default startup configuration of VPP on all DUTs
| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
| | ... | ${dut1} | ${dut1_if1}
| | ... | ${dut2} | ${dut2_if2}