From 3e8a10ce9f0481d610aafa41f3195b0900122eb4 Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Tue, 11 Sep 2018 14:12:54 +0200
Subject: Add dot1q-ip4base-[ndrpdr|mrr] perf tests for 2-node topology

Jira: CSIT-1278

Change-Id: I3cc929222d7fd58f38e33917e84675e9c0b55bbd
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot    | 4 ++--
 tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot | 7 ++++---
 tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot          | 6 +++---
 tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot       | 6 +++---
 tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot          | 2 +-
 tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot       | 2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'tests/vpp/perf/l2')

diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot
index 3b2d5304ab..6613cb16a2 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot
@@ -52,12 +52,12 @@
 | ${tag_rewrite}= | pop-1
 | ${overhead}= | ${4}
 # X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
+| ${s_limit}= | ${10000000000}
 # Bridge domain IDs
 | ${bd_id1}= | 1
 | ${bd_id2}= | 2
 # Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot
index d539454c4f..4706c1ec36 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -29,7 +29,8 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with 802.1q test cases*
+| Documentation | *RFC2544: Pkt throughput L2BD test cases with 802.1q test\
+| ... | cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
@@ -56,12 +57,12 @@
 | ${tag_rewrite}= | pop-1
 | ${overhead}= | ${4}
 # X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
+| ${s_limit}= | ${10000000000}
 # Bridge domain IDs
 | ${bd_id1}= | 1
 | ${bd_id2}= | 2
 # Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | Local Template
diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot
index 8d9648cb2d..0d91c61dcb 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot
@@ -52,9 +52,9 @@
 | ${tag_rewrite}= | pop-1
 | ${overhead}= | ${4}
 # X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
+| ${s_limit}= | ${10000000000}
 # Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | Local Template
@@ -78,7 +78,7 @@
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
 | | And Set interfaces in path up
-| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
+| | When Initialize VLAN dot1q sub-interfaces in circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot
index 2771504df7..191cfdb7f2 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot
@@ -56,9 +56,9 @@
 | ${tag_rewrite}= | pop-1
 | ${overhead}= | ${4}
 # X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
+| ${s_limit}= | ${10000000000}
 # Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | Local Template
@@ -83,7 +83,7 @@
 | | ${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 VLAN dot1q sub-interfaces in 3-node circular topology
+| | When Initialize VLAN dot1q sub-interfaces in circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot
index 8e7fb01cd5..5d143f36b5 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot
@@ -78,7 +78,7 @@
 | | ... | ${s_limit} | ${framesize} | overhead=${overhead}
 | | And Apply startup configuration on all VPP DUTs
 | | And Set interfaces in path up
-| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
+| | When Initialize VLAN dot1q sub-interfaces in circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index 059d1a6ed2..0bf0d59930 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -83,7 +83,7 @@
 | | ${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 VLAN dot1q sub-interfaces in 3-node circular topology
+| | When Initialize VLAN dot1q sub-interfaces in circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-- 
cgit 1.2.3-korg