Improve doc in data driven perf tests

Change-Id: I1aed068cfd502d4064be194417e91e0459d25a88
Signed-off-by: Tibor Frank <tifrank@cisco.com>

6 files changed, 132 insertions, 63 deletions

diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
index 0ddac51a1b..ed98967f4a 100644
--- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
+++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
@@ -56,6 +56,18 @@
 | | ... | IPv4 prefix length + ea bits length < 32 (o + r < 32)
 | | ... | psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
 | | ...
+| | ... | Arguments:
+| | ...
+| | ... | - ipv4_pfx
+| | ... | - ipv6_pfx
+| | ... | - ipv6_src
+| | ... | - ea_bit_len
+| | ... | - psid_offset
+| | ... | - psid_len
+| | ... | - ipv4_dst
+| | ... | - dst_port
+| | ... | - expected_ipv6_dst
+| | ...
 # TODO: replace setup when VPP-312 fixed
 #| | [Setup] | Set Interfaces IP Addresses And Routes
 | | [Setup] | Run Keywords
@@ -81,6 +93,18 @@
 | | ... | IPv4 prefix length + ea bits length == 32 (o + r == 32)
 | | ... | psid_length = 0, ip6_prefix < 64, ip4_prefix <= 32
 | | ...
+| | ... | Arguments:
+| | ...
+| | ... | - ipv4_pfx
+| | ... | - ipv6_pfx
+| | ... | - ipv6_src
+| | ... | - ea_bit_len
+| | ... | - psid_offset
+| | ... | - psid_len
+| | ... | - ipv4_dst
+| | ... | - dst_port
+| | ... | - expected_ipv6_dst
+| | ...
 # TODO: replace setup when VPP-312 fixed
 #| | [Setup] | Set Interfaces IP Addresses And Routes
 | | [Setup] | Run Keywords
@@ -109,6 +133,18 @@
 | | ... | IPv4 prefix length + ea bits length > 32 (o + r > 32)
 | | ... | ip6_prefix < 64, ip4_prefix <= 32
 | | ...
+| | ... | Arguments:
+| | ...
+| | ... | - ipv4_pfx
+| | ... | - ipv6_pfx
+| | ... | - ipv6_src
+| | ... | - ea_bit_len
+| | ... | - psid_offset
+| | ... | - psid_len
+| | ... | - ipv4_dst
+| | ... | - dst_port
+| | ... | - expected_ipv6_dst
+| | ...
 # TODO: replace setup when VPP-312 fixed
 #| | [Setup] | Set Interfaces IP Addresses And Routes
 | | [Setup] | Run Keywords
@@ -156,6 +192,17 @@
 | | [Documentation]
 | | ... | Supported End-User IPv6 prefix length is 64 bit.
 | | ...
+| | ... | Arguments:
+| | ...
+| | ... | - ipv4_pfx
+| | ... | - ipv6_pfx
+| | ... | - ipv6_src
+| | ... | - ea_bit_len
+| | ... | - psid_offset
+| | ... | - psid_len
+| | ... | - ipv4_dst
+| | ... | - dst_port
+| | ...
 # TODO: replace setup when VPP-312 fixed
 #| | [Setup] | Set Interfaces IP Addresses And Routes
 | | [Setup] | Run Keywords
diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
index 4167ca2bcf..2223cd61f9 100644
--- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
+++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
@@ -52,6 +52,19 @@
 | TC01: MAP-T test
 | | [Documentation] |
 | | ... | Test to check map-t address translation.
+| | ...
+| | ... | Arguments:
+| | ...
+| | ... | - ipv4_pfx
+| | ... | - ipv6_dst_pfx
+| | ... | - ipv6_src_pfx
+| | ... | - ea_bit_len
+| | ... | - psid_offset
+| | ... | - psid_len
+| | ... | - ipv4_src
+| | ... | - ipv4_dst
+| | ... | - dst_port
+| | ...
 | | [Template] | Check MAP-T configuration with traffic script
 # |===================|===============|================|============|=============|==========|===========|================|==========|
 # | ipv4_pfx          | ipv6_dst_pfx  | ipv6_src_pfx   | ea_bit_len | psid_offset | psid_len | ipv4_src  | ipv4_dst       | dst_port |
diff --git a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 62a757cf31..c7787f3006 100644
--- a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -105,7 +105,7 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 1 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -115,7 +115,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 1 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -125,7 +125,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -135,7 +135,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -145,7 +145,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc05-9000B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -155,7 +155,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc06-9000B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -165,7 +165,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 2 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -175,7 +175,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 2 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -185,7 +185,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -195,7 +195,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -205,7 +205,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc11-9000B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -215,7 +215,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc12-9000B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -225,7 +225,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 4 | 2
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -235,7 +235,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 4 | 2
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -245,7 +245,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -255,7 +255,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -265,7 +265,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc17-9000B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -275,7 +275,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc18-9000B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 04eca8c9ab..f36903acb9 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -91,7 +91,7 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 1 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -101,7 +101,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 1 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -111,7 +111,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -121,7 +121,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -131,7 +131,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc05-9000B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -141,7 +141,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc06-9000B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -151,7 +151,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 2 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -161,7 +161,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 2 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -171,7 +171,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -181,7 +181,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -191,7 +191,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc11-9000B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -201,7 +201,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc12-9000B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -211,7 +211,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 4 | 2
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
 | | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -221,7 +221,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 4 | 2
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
 | | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -231,7 +231,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -241,7 +241,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -251,7 +251,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc17-9000B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -261,7 +261,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc18-9000B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 6808e68bc5..24e021ecbe 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -91,7 +91,7 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 1 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -101,7 +101,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 1 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -111,7 +111,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -121,7 +121,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -131,7 +131,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc05-9000B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -141,7 +141,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc06-9000B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
 | | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -151,7 +151,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 2 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -161,7 +161,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 2 | 1
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -171,7 +171,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -181,7 +181,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -191,7 +191,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc11-9000B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -201,7 +201,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc12-9000B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
 | | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -211,7 +211,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 4 | 2
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
 | | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -221,7 +221,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 4 | 2
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
 | | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -231,7 +231,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -241,7 +241,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -251,7 +251,7 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc17-9000B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -261,7 +261,7 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc18-9000B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
 | | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 35a36a1db5..b58f133e7d 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -130,7 +130,8 @@
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 1 | 1 | ${s_18.75Mpps}
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
+| | ... | s_limit=${s_18.75Mpps}
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -140,7 +141,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 1 | 1 | ${s_24.5G}
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
+| | ... | s_limit=${s_24.5G}
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -150,7 +152,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search BW limit
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 2 | 1 | ${s_18.75Mpps}
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
+| | ... | s_limit=${s_18.75Mpps}
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -160,7 +163,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 2 | 1 | ${s_24.5G}
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
+| | ... | s_limit=${s_24.5G}
 | | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -170,7 +174,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search BW limit
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 4 | 2 | ${s_18.75Mpps}
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
+| | ... | s_limit=${s_18.75Mpps}
 | | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -180,7 +185,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 4 | 2 | ${s_24.5G}
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
+| | ... | s_limit=${s_24.5G}
 | | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -190,7 +196,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search BW limit
 
 | tc19-IMIX-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | IMIX_v4_1 | ${100000} | 1 | 1 | ${s_24.5G}
+| | ... | framesize=IMIX_v4_1 | min_rate=${100000} | wt=1 | rxq=1
+| | ... | s_limit=${s_24.5G}
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -200,7 +207,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search BW limit
 
 | tc20-IMIX-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | IMIX_v4_1 | ${100000} | 2 | 1 | ${s_24.5G}
+| | ... | framesize=IMIX_v4_1 | min_rate=${100000} | wt=2 | rxq=1
+| | ... | s_limit=${s_24.5G}
 | | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
@@ -210,7 +218,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search BW limit
 
 | tc21-IMIX-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | IMIX_v4_1 | ${100000} | 4 | 2 | ${s_24.5G}
+| | ... | framesize=IMIX_v4_1 | min_rate=${100000} | wt=4 | rxq=2
+| | ... | s_limit=${s_24.5G}
 | | [Tags] | IMIX | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\