CSIT-1097: Migrate ip4_tun to NDRPDR and edit MRR

Change-Id: I20fe137cfbbcea1e337fe6295818ea105953d006
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

1 files changed, 40 insertions, 45 deletions

diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot
index 093ffea82d..9ff706999f 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-mrr.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Teardown | Tear down performance mrr test
 | ...
-| Test Template | Local template
+| Test Template | Local Template
 | ...
 | Documentation | *Raw results L2BD with VXLANoIPv4 test cases*
 | ...
@@ -48,12 +48,12 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit}= | ${10000000000}
-| ${vxlan_overhead}= | ${50}
+| ${overhead}= | ${50}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
-| Local template
+| Local Template
 | | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD forwarding config.
@@ -67,67 +67,62 @@
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | | ...
-| | [Arguments] | ${phy_cores} | ${framesize} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit}
-| | ... | ${get_framesize + ${vxlan_overhead}}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | And Run Keyword If | ${get_framesize + ${vxlan_overhead}} < ${1522}
-| | ... | Add no multi seg to all DUTs
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
+| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr
+| tc01-64B-1c-ethip4vxlan-l2bdbasemaclrn-mrr
 | | [Tags] | 64B | 1C
-| | phy_cores=${1} | framesize=${64}
+| | framesize=${64} | phy_cores=${1}
 
-| tc02-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | phy_cores=${1} | framesize=${1518}
+| tc02-64B-2c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 64B | 2C
+| | framesize=${64} | phy_cores=${2}
 
-| tc03-9000B-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 1C
-| | phy_cores=${1} | framesize=${9000}
+| tc03-64B-4c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
 
-| tc04-IMIX-1t1c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | phy_cores=${1} | framesize=IMIX_v4_1
+| tc04-1518B-1c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
 
-| tc05-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 2C
-| | phy_cores=${2} | framesize=${64}
+| tc05-1518B-2c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
 
-| tc06-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 2C | SKIP_PATCH
-| | phy_cores=${2} | framesize=${1518}
+| tc06-1518B-4c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
 
-| tc07-9000B-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 2C | SKIP_PATCH
-| | phy_cores=${2} | framesize=${9000}
+| tc07-9000B-1c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
 
-| tc08-IMIX-2t2c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | phy_cores=${2} | framesize=IMIX_v4_1
+| tc08-9000B-2c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
 
-| tc09-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 4C
-| | phy_cores=${4} | framesize=${64}
+| tc09-9000B-4c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
 
-| tc10-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 4C | SKIP_PATCH
-| | phy_cores=${4} | framesize=${1518}
+| tc10-IMIX-1c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-9000B-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 4C | SKIP_PATCH
-| | phy_cores=${4} | framesize=${9000}
+| tc11-IMIX-2c-ethip4vxlan-l2bdbasemaclrn-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4t4c-ethip4vxlan-l2bdbasemaclrn-mrr
+| tc12-IMIX-4c-ethip4vxlan-l2bdbasemaclrn-mrr
 | | [Tags] | IMIX | 4C
-| | phy_cores=${4} | framesize=IMIX_v4_1
+| | framesize=IMIX_v4_1 | phy_cores=${4}