Test both traffic directions for bidirectional topology

- l2 bridge domain
- l2 cross connects

Change-Id: I45b4c1e5aa72e55ff05ed84f4748a0ea41c99a18
Signed-off-by: Jan Gelety <jgelety@cisco.com>

2 files changed, 17 insertions, 13 deletions

diff --git a/tests/suites/bridge_domain/test.robot b/tests/suites/bridge_domain/test.robot
index 071e375ff4..a7f1104224 100644
--- a/tests/suites/bridge_domain/test.robot
+++ b/tests/suites/bridge_domain/test.robot
@@ -30,42 +30,45 @@
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | Compute Path | always_same_link=${FALSE}
-| | ${src_if} | ${tmp}= | First Interface
-| | ${dst_if} | ${tmp}= | Last Interface
+| | ${tg_if1} | ${tmp}= | First Interface
+| | ${tg_if2} | ${tmp}= | Last Interface
 | | ${bd_if1} | ${tmp}= | First Ingress Interface
 | | ${bd_if2} | ${tmp}= | Last Egress Interface
 | | Vpp l2bd forwarding setup | ${nodes['DUT1']} | ${bd_if1} | ${bd_if2}
-| | Send and receive traffic | ${nodes['TG']} | ${src_if} | ${dst_if}
+| | Send and receive traffic | ${nodes['TG']} | ${tg_if1} | ${tg_if2}
+| | Send and receive traffic | ${nodes['TG']} | ${tg_if2} | ${tg_if1}
 
 | Vpp forwards packets via L2 bridge domain in circular topology
 | | [Tags] | 3_NODE_SINGLE_LINK_TOPO
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | ...          | ${nodes['TG']}
 | | Compute Path
-| | ${src_if} | ${tg}= | Next Interface
+| | ${tg_if1} | ${tg}= | Next Interface
 | | ${dut1_if1} | ${dut1}= | Next Interface
 | | ${dut1_if2} | ${dut1}= | Next Interface
 | | ${dut2_if1} | ${dut2}= | Next Interface
 | | ${dut2_if2} | ${dut2}= | Next Interface
-| | ${dst_if} | ${tg}= | Next Interface
+| | ${tg_if2} | ${tg}= | Next Interface
 | | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | Send and receive traffic | ${tg} | ${src_if} | ${dst_if}
+| | Send and receive traffic | ${tg} | ${tg_if1} | ${tg_if2}
+| | Send and receive traffic | ${tg} | ${tg_if2} | ${tg_if1}
 
 | Vpp forwards packets via L2 bridge domain in circular topology with static L2FIB entries
 | | [Tags] | 3_NODE_SINGLE_LINK_TOPO
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | ...          | ${nodes['TG']}
 | | Compute Path
-| | ${src_if} | ${tg}= | Next Interface
+| | ${tg_if1} | ${tg}= | Next Interface
 | | ${dut1_if1} | ${dut1}= | Next Interface
 | | ${dut1_if2} | ${dut1}= | Next Interface
 | | ${dut2_if1} | ${dut2}= | Next Interface
 | | ${dut2_if2} | ${dut2}= | Next Interface
-| | ${dst_if} | ${tg}= | Next Interface
-| | ${mac}= | Get Interface Mac | ${tg} | ${dst_if}
+| | ${tg_if2} | ${tg}= | Next Interface
+| | ${mac}= | Get Interface Mac | ${tg} | ${tg_if2}
 | | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2} | ${FALSE}
 | | ...                       | ${mac}
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2} | ${FALSE}
 | | ...                       | ${mac}
-| | Send and receive traffic | ${tg} | ${src_if} | ${dst_if}
+| | Send and receive traffic | ${tg} | ${tg_if1} | ${tg_if2}
+| | Send and receive traffic | ${tg} | ${tg_if2} | ${tg_if1}
diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
index 033a109ef1..0dd3251aca 100644
--- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
+++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
@@ -27,13 +27,14 @@
 | Vpp forwards packets via L2 xconnect in circular topology
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | Compute Path
-| | ${src_if} | ${tg}= | Next Interface
+| | ${tg_if1} | ${tg}= | Next Interface
 | | ${dut1_if1} | ${dut1}= | Next Interface
 | | ${dut1_if2} | ${dut1}= | Next Interface
 | | ${dut2_if1} | ${dut2}= | Next Interface
 | | ${dut2_if2} | ${dut2}= | Next Interface
-| | ${dst_if} | ${tg}= | Next Interface
+| | ${tg_if2} | ${tg}= | Next Interface
 | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
-| | Send and receive traffic | ${tg} | ${src_if} | ${dst_if}
+| | Send and receive traffic | ${tg} | ${tg_if1} | ${tg_if2}
+| | Send and receive traffic | ${tg} | ${tg_if2} | ${tg_if1}