Refactor perf test cases

- Refactor Performance TCs due to changes in Hyperthreading and RXQ allocations.
- Simplify the structure of suite to avoid large refactors in future.

Change-Id: Ifb1b9719391f26745f075a900bd9fb39b6cb809c
Signed-off-by: Peter Mikus <pmikus@cisco.com>

1 files changed, 17 insertions, 15 deletions

diff --git a/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 2f2ea98fe4..3d16103d19 100644
--- a/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -26,6 +26,8 @@
 | Test Teardown | Tear down performance discovery test | ${min_rate}pps
 | ... | ${framesize} | ${traffic_profile}
 | ...
+| Test Template | Local template
+| ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -58,15 +60,15 @@
 
 *** Keywords ***
 | L2 Bridge Domain Binary Search BW limit
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${s_limit}
-| | ... | ${search_type}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${s_limit}
+| | ... | ${search_type} | ${min_rate}=${50000}
 | | Set Test Variable | ${framesize}
 | | Set Test Variable | ${min_rate}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
+| | Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${None}
 | | Add PCI devices to all DUTs
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
@@ -85,15 +87,15 @@
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | L2 Bridge Domain Binary Search
-| | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${s_limit}
-| | ... | ${search_type}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${s_limit}
+| | ... | ${search_type} | ${min_rate}=${50000}
 | | Set Test Variable | ${framesize}
 | | Set Test Variable | ${min_rate}
 | | ${max_rate}= | Set Variable | ${s_limit}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
+| | Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${None}
 | | Add PCI devices to all DUTs
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
@@ -120,7 +122,7 @@
 | | ... | 18.75Mpps rate, step 50kpps.
 | | [Tags] | 64B | 1C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=1 | rxq=1
+| | framesize=${64}  | phy_cores=${1}
 | | ... | s_limit=${s_18.75Mpps} | search_type=NDR
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
@@ -131,7 +133,7 @@
 | | ... | 24.5G rate, step 50kpps.
 | | [Tags] | 1518B | 1C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=${1518} | min_rate=${50000} | wt=1 | rxq=1
+| | framesize=${1518}  | phy_cores=${1}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
@@ -142,7 +144,7 @@
 | | ... | 18.75Mpps rate, step 50kpps.
 | | [Tags] | 64B | 2C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=2 | rxq=1
+| | framesize=${64}  | phy_cores=${2}
 | | ... | s_limit=${s_18.75Mpps} | search_type=NDR
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
@@ -153,7 +155,7 @@
 | | ... | 24.5G rate, step 50kpps.
 | | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=${1518} | min_rate=${50000} | wt=2 | rxq=1
+| | framesize=${1518}  | phy_cores=${2}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
@@ -164,7 +166,7 @@
 | | ... | 18.75Mpps rate, step 50kpps.
 | | [Tags] | 64B | 4C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search
-| | framesize=${64} | min_rate=${50000} | wt=4 | rxq=2
+| | framesize=${64}  | phy_cores=${4}
 | | ... | s_limit=${s_18.75Mpps} | search_type=NDR
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
@@ -175,7 +177,7 @@
 | | ... | 24.5G rate, step 50kpps.
 | | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=${1518} | min_rate=${50000} | wt=4 | rxq=2
+| | framesize=${1518}  | phy_cores=${4}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc19-IMIX-1t1c-eth-l2bdbasemaclrn-ndrdisc
@@ -186,7 +188,7 @@
 | | ... | 24.5G rate, step 50kpps.
 | | [Tags] | IMIX | 1C | NDRDISC
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=1 | rxq=1
+| | framesize=IMIX_v4_1  | phy_cores=${1}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc20-IMIX-2t2c-eth-l2bdbasemaclrn-ndrdisc
@@ -197,7 +199,7 @@
 | | ... | 24.5G rate, step 50kpps.
 | | [Tags] | IMIX | 2C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=2 | rxq=1
+| | framesize=IMIX_v4_1  | phy_cores=${2}
 | | ... | s_limit=${s_24.5G} | search_type=NDR
 
 | tc21-IMIX-4t4c-eth-l2bdbasemaclrn-ndrdisc
@@ -208,6 +210,6 @@
 | | ... | 24.5G rate, step 50kpps.
 | | [Tags] | IMIX | 4C | NDRDISC | SKIP_PATCH
 | | [Template] | L2 Bridge Domain Binary Search BW limit
-| | framesize=IMIX_v4_1 | min_rate=${50000} | wt=4 | rxq=2
+| | framesize=IMIX_v4_1  | phy_cores=${4}
 | | ... | s_limit=${s_24.5G} | search_type=NDR