From 6afd4834db96cab257352bf02449e9e526198f96 Mon Sep 17 00:00:00 2001
From: pmikus <pmikus@cisco.com>
Date: Wed, 20 Apr 2016 15:49:44 +0200
Subject: [PATCH] Performance test cases

- JIRA: CSIT-10
- Add 1518B and 9000B test for multicore tests
- Fine tune threshold for short tests based on previous benchmarks
- Fix SI units

Change-Id: I5c4657dfd881a24b2e40c91ea80a979003754258
Signed-off-by: pmikus <pmikus@cisco.com>
---
 tests/suites/performance/long_bridge_domain.robot  |  88 +++++++++++---
 tests/suites/performance/long_ipv4.robot           | 129 ++++++++++++++++++---
 tests/suites/performance/long_xconnect.robot       |  83 ++++++++++---
 tests/suites/performance/short_bridge_domain.robot |  85 ++++++++++----
 tests/suites/performance/short_ipv4.robot          |  93 ++++++++++-----
 tests/suites/performance/short_xconnect.robot      |  92 ++++++++++-----
 6 files changed, 443 insertions(+), 127 deletions(-)

diff --git a/tests/suites/performance/long_bridge_domain.robot b/tests/suites/performance/long_bridge_domain.robot
index 44cab87df4..477e0467ed 100644
--- a/tests/suites/performance/long_bridge_domain.robot
+++ b/tests/suites/performance/long_bridge_domain.robot
@@ -20,6 +20,12 @@
 | Test Teardown | Run Keywords | Show statistics on all DUTs
 | ...           | AND          | Reset startup configuration of VPP on all DUTs
 | Documentation | *Throughput search suite (based on RFC2544).*
+| ...
+| ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
+| ... | between nodes. Traffic profile contain 2 L2 streams (1 stream per
+| ... | direction). Packets contain Ethernet header, IPv4 header,
+| ... | IP protocol=61 and random payload. Ethernet header MAC addresses are
+| ... | matching MAC addresses of the TG node.
 
 *** Test Cases ***
 | Find NDR by using RFC2544 linear search and 64B frames through bridge domain in 3-node topology
@@ -27,16 +33,13 @@
 | | ... | Find throughput with non drop rate for 64B frames by using
 | | ... | linear search starting at 4.1Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 4100000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -47,16 +50,13 @@
 | | ... | linear search starting at 812,743pps, stepping down with step of
 | | ... | 10,000pps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 1518
 | | ${start_rate}= | Set Variable | 812743
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -67,16 +67,13 @@
 | | ... | linear search starting at 138,580pps, stepping down with step of
 | | ... | 5,000pps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 9000
 | | ${start_rate}= | Set Variable | 138580
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -86,16 +83,47 @@
 | | ... | Find throughput on 2 cores with non drop rate for 64B frames by using
 | | ... | linear search starting at 8.2Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 8200000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Linear search
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-bridge
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 1518B frames through bridge domain in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 2 cores with non drop rate for 1518B frames by
+| | ... | using linear search starting at 812,743pps, stepping down with step
+| | ... | of 10,000pps
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${start_rate}= | Set Variable | 812743
+| | ${step_rate}= | Set Variable | 10000
+| | ${min_rate}= | Set Variable | 10000
+| | ${max_rate}= | Set Variable | 812743
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-bridge
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 9000B frames through bridge domain in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 2 cores with non drop rate for 9000B frames by
+| | ... | using linear search starting at 138,580pps, stepping down with step
+| | ... | of 5,000pps
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${start_rate}= | Set Variable | 138580
+| | ${step_rate}= | Set Variable | 5000
+| | ${min_rate}= | Set Variable | 5000
+| | ${max_rate}= | Set Variable | 138580
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -106,17 +134,47 @@
 | | ... | frames by using linear search starting at 9.8Mpps, stepping down
 | | ... | with step of 0.1Mpps
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 9800000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
 
+| Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 1518B frames through bridge domain in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 1518B
+| | ... | frames by using linear search starting at 812,743pps, stepping down
+| | ... | with step of 10,000pps
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${start_rate}= | Set Variable | 812743
+| | ${step_rate}= | Set Variable | 10000
+| | ${min_rate}= | Set Variable | 10000
+| | ${max_rate}= | Set Variable | 812743
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-bridge
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 9000B frames through bridge domain in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 9000B
+| | ... | frames by using linear search starting at 138,580pps, stepping
+| | ... | down with step of 5,000pps
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${start_rate}= | Set Variable | 138580
+| | ${step_rate}= | Set Variable | 5000
+| | ${min_rate}= | Set Variable | 5000
+| | ${max_rate}= | Set Variable | 138580
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-bridge
+| | ...                                       | ${min_rate} | ${max_rate}
diff --git a/tests/suites/performance/long_ipv4.robot b/tests/suites/performance/long_ipv4.robot
index 7b2111ab63..ac363136af 100644
--- a/tests/suites/performance/long_ipv4.robot
+++ b/tests/suites/performance/long_ipv4.robot
@@ -24,6 +24,12 @@
 | Test Teardown | Run Keywords | Show statistics on all DUTs
 | ...           | AND          | Reset startup configuration of VPP on all DUTs
 | Documentation | *Throughput search suite (based on RFC2544).*
+| ...
+| ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
+| ... | between nodes. Traffic profile contain 2 L3 streams (1 stream per
+| ... | direction). Packets contain Ethernet header, IPv4 header,
+| ... | IP protocol=61 and random payload. Ethernet header MAC addresses are
+| ... | matching MAC addresses of the TG node.
 
 *** Test Cases ***
 | Find NDR by using RFC2544 linear search and 64B frames through IPv4 forwarding in 3-node topology
@@ -31,16 +37,13 @@
 | | ... | Find throughput with non drop rate for 64B frames by using
 | | ... | linear search starting at 4.1Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 4400000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -51,16 +54,13 @@
 | | ... | linear search starting at 812,743pps, stepping down with step of
 | | ... | 10,000pps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 1518
 | | ${start_rate}= | Set Variable | 812743
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -71,16 +71,13 @@
 | | ... | linear search starting at 138,580pps, stepping down with step of
 | | ... | 5,000pps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 9000
 | | ${start_rate}= | Set Variable | 138580
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -90,36 +87,134 @@
 | | ... | Find throughput on 2 cores with non drop rate for 64B frames by using
 | | ... | linear search starting at 8.8Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 8800000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Linear search
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-IPv4
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 1518B frames through IPv4 forwarding in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 2 cores with non drop rate for 1518B frames by
+| | ... | using linear search starting at 812,743pps, stepping down with step
+| | ... | of 10.000pps
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${start_rate}= | Set Variable | 812743
+| | ${step_rate}= | Set Variable | 10000
+| | ${min_rate}= | Set Variable | 10000
+| | ${max_rate}= | Set Variable | 812743
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-IPv4
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 9000B frames through IPv4 forwarding in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 2 cores with non drop rate for 9000B frames by
+| | ... | using linear search starting at 138,580pps, stepping down with step
+| | ... | of 5,000pps
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${start_rate}= | Set Variable | 138580
+| | ${step_rate}= | Set Variable | 5000
+| | ${min_rate}= | Set Variable | 5000
+| | ${max_rate}= | Set Variable | 138580
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 64B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
-| | ... | Find throughput on 2 cores with non drop rate for 64B frames by using
-| | ... | linear search starting at 9.8Mpps, stepping down with step of 0.1Mpps
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 64B
+| | ... | frames by using linear search starting at 9.8Mpps, stepping down with
+| | ... | step of 0.1Mpps
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 9800000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 
+| Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 1518B frames through IPv4 forwarding in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 1518B
+| | ... | frames by using linear search starting at 812,743pps, stepping down
+| | ... | with step of 10.000pps
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${start_rate}= | Set Variable | 812743
+| | ${step_rate}= | Set Variable | 10000
+| | ${min_rate}= | Set Variable | 10000
+| | ${max_rate}= | Set Variable | 812743
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-IPv4
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 9000B frames through IPv4 forwarding in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 9000B
+| | ... | frames by using linear search starting at 138,580pps, stepping down
+| | ... | with step of 5,000pps
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${start_rate}= | Set Variable | 138580
+| | ${step_rate}= | Set Variable | 5000
+| | ${min_rate}= | Set Variable | 5000
+| | ${max_rate}= | Set Variable | 138580
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-IPv4
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 2 cores by using RFC2544 binary search and 64B frames through IPv4 forwarding in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 2 cores with non drop rate for 64B
+| | ... | frames by using binary search with threshold 5,000pps
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 64
+| | ${binary_min}= | Set Variable | 8000000
+| | ${binary_max}= | Set Variable | 9000000
+| | ${min_rate}= | Set Variable | 100000
+| | ${max_rate}= | Set Variable | 14880952
+| | ${threshold}= | Set Variable | 5000
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
+| | ...                                       | ${binary_max} | 3-node-IPv4
+| | ...                                       | ${min_rate} | ${max_rate}
+| | ...                                       | ${threshold}
+
+| Find NDR with 4 cores and rss 2 by using RFC2544 binary search and 64B frames through IPv4 forwarding in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 64B
+| | ... | frames by using binary search with threshold 5,000pps
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 64
+| | ${binary_min}= | Set Variable | 8000000
+| | ${binary_max}= | Set Variable | 10000000
+| | ${min_rate}= | Set Variable | 100000
+| | ${max_rate}= | Set Variable | 14880952
+| | ${threshold}= | Set Variable | 5000
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
+| | ...                                       | ${binary_max} | 3-node-IPv4
+| | ...                                       | ${min_rate} | ${max_rate}
+| | ...                                       | ${threshold}
diff --git a/tests/suites/performance/long_xconnect.robot b/tests/suites/performance/long_xconnect.robot
index fab92e6b54..bc191bdb2e 100644
--- a/tests/suites/performance/long_xconnect.robot
+++ b/tests/suites/performance/long_xconnect.robot
@@ -34,7 +34,6 @@
 | | ... | Find throughput with non drop rate for 64B frames by using
 | | ... | linear search starting at 5Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 4800000
 | | ${step_rate}= | Set Variable | 100000
@@ -42,7 +41,6 @@
 | | ${max_rate}= | Set Variable | 14880952
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -52,16 +50,13 @@
 | | ... | Find throughput with non drop rate for 1518B frames by using
 | | ... | linear search starting at 812,743pps, stepping down with step of 10,000pps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 1518
 | | ${start_rate}= | Set Variable | 812743
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -71,16 +66,13 @@
 | | ... | Find throughput with non drop rate for 9000B frames by using
 | | ... | linear search starting at 138,580pps, stepping down with step 5,000pps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 9000
 | | ${start_rate}= | Set Variable | 138580
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -90,16 +82,47 @@
 | | ... | Find throughput on 2 cores with non drop rate for 64B frames by using
 | | ... | linear search starting at 8.2Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 12000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Linear search
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-xconnect
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 1518B frames through L2 cross connect in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 2 cores with non drop rate for 1518B frames by
+| | ... | using linear search starting at 812,743pps, stepping down with step
+| | ... | of 10,000pps
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${start_rate}= | Set Variable | 812743
+| | ${step_rate}= | Set Variable | 10000
+| | ${min_rate}= | Set Variable | 10000
+| | ${max_rate}= | Set Variable | 812743
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-xconnect
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 9000B frames through L2 cross connect in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 2 cores with non drop rate for 9000B frames by
+| | ... | using linear search starting at 138,580pps, stepping down with step
+| | ... | of 5,000pps
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${start_rate}= | Set Variable | 138580
+| | ${step_rate}= | Set Variable | 5000
+| | ${min_rate}= | Set Variable | 5000
+| | ${max_rate}= | Set Variable | 138580
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -107,20 +130,50 @@
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 64B frames through L2 cross connect in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 4 cores and rss 2 with non drop rate for 64B
-| | ... | frames by using linear search starting at 8.2Mpps, stepping down
+| | ... | frames by using linear search starting at 12.2Mpps, stepping down
 | | ... | with step of 0.1Mpps
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${start_rate}= | Set Variable | 12200000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | # VPP setup
 | | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Linear search
 | | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 
+| Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 1518B frames through L2 cross connect in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 1518B
+| | ... | frames by using linear search starting at 812,743pps, stepping down
+| | ... | with step of 10,000pps
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${start_rate}= | Set Variable | 812743
+| | ${step_rate}= | Set Variable | 10000
+| | ${min_rate}= | Set Variable | 10000
+| | ${max_rate}= | Set Variable | 812743
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-xconnect
+| | ...                                       | ${min_rate} | ${max_rate}
+
+| Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 9000B frames through L2 cross connect in 3-node topology
+| | [Documentation]
+| | ... | Find throughput on 4 cores and rss 2 with non drop rate for 9000B frames by
+| | ... | using linear search starting at 138,580pps, stepping down with step
+| | ... | of 5,000pps
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${start_rate}= | Set Variable | 138580
+| | ${step_rate}= | Set Variable | 5000
+| | ${min_rate}= | Set Variable | 5000
+| | ${max_rate}= | Set Variable | 138580
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
+| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                       | ${step_rate} | 3-node-xconnect
+| | ...                                       | ${min_rate} | ${max_rate}
diff --git a/tests/suites/performance/short_bridge_domain.robot b/tests/suites/performance/short_bridge_domain.robot
index 27671c1259..81ba0319d8 100644
--- a/tests/suites/performance/short_bridge_domain.robot
+++ b/tests/suites/performance/short_bridge_domain.robot
@@ -22,19 +22,16 @@
 | Documentation | Minimal throughput acceptance test cases
 
 *** Test Cases ***
-| 1core VPP passes 64B frames through bridge domain at 2x 3.5Mpps in 3-node topology
+| 1core VPP passes 64B frames through bridge domain at 2x 3.2Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 1 core should pass 64B frames through bridge domain
-| | ... | at 2x3.5Mpps in 3-node topology
+| | ... | at 2x3.2Mpps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 3.5mpps
-| | # VPP setup
+| | ${rate}= | Set Variable | 3.2mpps
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -43,14 +40,11 @@
 | | ... | VPP with 1 core should pass 1518B frames through bridge domain
 | | ... | at 2x10Gbps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 10gbps
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -59,45 +53,88 @@
 | | ... | VPP with 1 core should pass 9000B frames through bridge domain
 | | ... | at 2x10Gbps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 10gbps
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
-| 2core VPP with rss 1 passes 64B frames through bridge domain at 2x 7.6Mpps in 3-node topology
+| 2core VPP with rss 1 passes 64B frames through bridge domain at 2x 6.9Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 2 cores should pass 64B frames through bridge domain
-| | ... | at 2x7.6Mpps in 3-node topology
+| | ... | at 2x6.9Mpps in 3-node topology
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 7.6mpps
-| | # VPP setup
+| | ${rate}= | Set Variable | 6.9mpps
 | | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
-| 4core VPP with rss 2 passes 64B frames through bridge domain at 2x 8.6Mpps in 3-node topology
+| 2core VPP with rss 1 passes 1518B frames through bridge domain at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 2 cores should pass 1518B frames through bridge domain
+| | ... | at 2x10Gbps in 3-node topology
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-bridge
+
+| 2core VPP with rss 1 passes 9000B frames through bridge domain at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 2 cores should pass 9000B frames through bridge domain
+| | ... | at 2x10Gbps in 3-node topology
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-bridge
+
+| 4core VPP with rss 2 passes 64B frames through bridge domain at 2x 7.9Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 4 cores and rss 2 should pass 64B frames through bridge
-| | ... | domain at 2x8.6Mpps in 3-node topology
+| | ... | domain at 2x7.9Mpps in 3-node topology
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 8.6mpps
-| | # VPP setup
+| | ${rate}= | Set Variable | 7.9mpps
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-bridge
+
+| 4core VPP with rss 2 passes 1518B frames through bridge domain at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 4 cores and rss 2 should pass 1518B frames through bridge
+| | ... | domain at 2x10Gbps in 3-node topology
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-bridge
+
+| 4core VPP with rss 2 passes 9000B frames through bridge domain at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 4 cores and rss 2should pass 9000B frames through bridge
+| | ... | domain at 2x10Gbps in 3-node topology
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
 | | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
 | | AND   L2 bridge domain initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
diff --git a/tests/suites/performance/short_ipv4.robot b/tests/suites/performance/short_ipv4.robot
index f96623beb6..549bb0adf4 100644
--- a/tests/suites/performance/short_ipv4.robot
+++ b/tests/suites/performance/short_ipv4.robot
@@ -26,82 +26,119 @@
 | Documentation | Minimal throughput acceptance test cases
 
 *** Test Cases ***
-| 1core VPP passes 64B frames through IPv4 forwarding at 2x 3.5mpps in 3-node topology
+| 1core VPP passes 64B frames through IPv4 forwarding at 2x 3.5Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 1 core should pass 64B frames through IPv4 forwarding
-| | ... | at 2x3.5mpps in 3-node topology
+| | ... | at 2x3.5Mpps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 3.5mpps
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
-| 1core VPP passes 1518B frames through IPv4 forwarding at 2x 10gbps in 3-node topology
+| 1core VPP passes 1518B frames through IPv4 forwarding at 2x 10Gbps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 1 core should pass 1518B frames through IPv4 forwarding
-| | ... | at 2x10gbps in 3-node topology
+| | ... | at 2x10Gbps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 10gbps
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
-| 1core VPP passes 9000B frames through IPv4 forwarding at 2x 10gbps in 3-node topology
+| 1core VPP passes 9000B frames through IPv4 forwarding at 2x 10Gbps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 1 core should pass 9000B frames through IPv4 forwarding
-| | ... | at 2x10gbps in 3-node topology
+| | ... | at 2x10Gbps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 10gbps
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
-| 2core VPP with rss 1 passes 64B frames through IPv4 forwarding at 2x 8.2mpps in 3-node topology
+| 2core VPP with rss 1 passes 64B frames through IPv4 forwarding at 2x 7.5Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 2 cores should pass 64B frames through IPv4 forwarding
-| | ... | at 2x8.2mpps in 3-node topology
+| | ... | at 2x7.5Mpps in 3-node topology
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 8.2mpps
-| | # VPP setup
+| | ${rate}= | Set Variable | 7.5mpps
 | | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
-| 4core VPP with rss 2 passes 64B frames through IPv4 forwarding at 2x 9.2mpps in 3-node topology
+| 2core VPP with rss 1 passes 1518B frames through IPv4 forwarding at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 2 cores should pass 1518B frames through IPv4 forwarding
+| | ... | at 2x10Gbps in 3-node topology
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-IPv4
+
+| 2core VPP with rss 1 passes 9000B frames through IPv4 forwarding at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 2 cores should pass 9000B frames through IPv4 forwarding
+| | ... | at 2x10Gbps in 3-node topology
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-IPv4
+
+| 4core VPP with rss 2 passes 64B frames through IPv4 forwarding at 2x 7.8Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 4 cores and rss 2 should pass 64B frames through IPv4
-| | ... | forwarding at 2x9.2mpps in 3-node topology
+| | ... | forwarding at 2x7.8Mpps in 3-node topology
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 9.2mpps
-| | # VPP setup
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | ${rate}= | Set Variable | 7.8mpps
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-IPv4
+
+| 4core VPP with rss 2 passes 1518B frames through IPv4 forwarding at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 4 cores and rss 2 should pass 1518B frames through IPv4
+| | ... | forwarding at 2x10Gbps in 3-node topology
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-IPv4
+
+| 4core VPP with rss 2 passes 9000B frames through IPv4 forwarding at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 4 cores and rss 2 should pass 9000B frames through IPv4
+| | ... | forwarding at 2x10Gbps in 3-node topology
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
 | | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
diff --git a/tests/suites/performance/short_xconnect.robot b/tests/suites/performance/short_xconnect.robot
index a909e8b8e7..25eef3f65c 100644
--- a/tests/suites/performance/short_xconnect.robot
+++ b/tests/suites/performance/short_xconnect.robot
@@ -23,83 +23,119 @@
 | Documentation | Minimal throughput acceptance test cases
 
 *** Test Cases ***
-| 1core VPP passes 64B frames through L2 cross connect at 2x 3.5mpps in 3-node topology
+| 1core VPP passes 64B frames through L2 cross connect at 2x 3.8Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 1 core should pass 64B frames through L2 cross connect
-| | ... | at 2x3.5mpps in 3-node topology
+| | ... | at 2x3.8Mpps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 3.5mpps
-| | # VPP setup
+| | ${rate}= | Set Variable | 3.8mpps
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-xconnect
 
-| 1core VPP passes 1518B frames through L2 cross connect at 2x 10gbps in 3-node topology
+| 1core VPP passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 1 core should pass 1518B frames through L2 cross connect
-| | ... | at 2x10gbps in 3-node topology
+| | ... | at 2x10Gbps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 10gbps
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-xconnect
 
-| 1core VPP passes 9000B frames through L2 cross connect at 2x 10gbps in 3-node topology
+| 1core VPP passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 1 core should pass 9000B frames through L2 cross connect
-| | ... | at 2x10gbps in 3-node topology
+| | ... | at 2x10Gbps in 3-node topology
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 10gbps
-| | # VPP setup
 | | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-xconnect
 
-| 2core VPP with rss 1 passes 64B frames through L2 cross connect at 2x 11.0mpps in 3-node topology
+| 2core VPP with rss 1 passes 64B frames through L2 cross connect at 2x 8.3Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 2 cores should pass 64B frames through L2 cross connect
-| | ... | at 2x11.0mpps in 3-node topology
+| | ... | at 2x8.3Mpps in 3-node topology
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
-| | # Variables
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 11.0mpps
-| | # VPP setup
+| | ${rate}= | Set Variable | 8.3mpps
 | | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-xconnect
 
-| 4core VPP with rss 2 passes 64B frames through L2 cross connect at 2x 11.6mpps in 3-node topology
+| 2core VPP with rss 1 passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 2 cores should pass 1518B frames through L2 cross connect
+| | ... | at 2x10Gbps in 3-node topology
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-xconnect
+
+| 2core VPP with rss 1 passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 2 cores should pass 9000B frames through L2 cross connect
+| | ... | at 2x10Gbps in 3-node topology
+| | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-xconnect
+
+| 4core VPP with rss 2 passes 64B frames through L2 cross connect at 2x 9.9Mpps in 3-node topology
 | | [Documentation]
 | | ... | VPP with 4 cores and rss 2 should pass 64B frames through L2 cross
-| | ... | connect at 2x11.6mpps in 3-node topology
-| | # Variables
+| | ... | connect at 2x9.9Mpps in 3-node topology
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 11.6mpps
-| | # VPP setup
+| | ${rate}= | Set Variable | 9.9mpps
 | | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
 | | AND   L2 xconnect initialized in a 3-node circular topology
-| | # Sent traffic with specified rate
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-xconnect
 
+| 4core VPP with rss 2 passes 1518B frames through L2 cross connect at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 4 cores and rss 2 should pass 1518B frames through L2 cross
+| | ... | connect at 2x10Gbps in 3-node topology
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 1518
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-xconnect
+
+| 4core VPP with rss 2 passes 9000B frames through L2 cross connect at 2x 10Gbps in 3-node topology
+| | [Documentation]
+| | ... | VPP with 4 cores and rss 2 should pass 9000B frames through L2 cross
+| | ... | connect at 2x10Gbps in 3-node topology
+| | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
+| | ${framesize}= | Set Variable | 9000
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
+| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | AND   L2 xconnect initialized in a 3-node circular topology
+| | Then Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                   | ${framesize} | 3-node-xconnect
-- 
2.16.6