X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fsuites%2Fl2_xconnect%2Fl2_xconnect_untagged.robot;h=0dd3251acadd278e33798d5615bb1656517cd20e;hp=f6c1cbdd72669967b6e47d729696c2181f9e59db;hb=994580369f92db56c79bab13c75180c9f38b9187;hpb=71b27a0864f4e02f8750de23fb6498369696734c

diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
index f6c1cbdd72..0dd3251aca 100644
--- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
+++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
@@ -15,8 +15,9 @@
 
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/l2_xconnect.robot
+| Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV
 | Test Setup | Setup all DUTs before test
 | Suite Setup | Setup all TGs before traffic script
 
@@ -24,16 +25,16 @@
 *** Test Cases ***
 
 | Vpp forwards packets via L2 xconnect 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
 | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | Sleep | 10 | Work around VPP interface up taking too long.
-| | Send and receive traffic | ${tg} | ${src_if} | ${dst_if}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+| | Send and receive traffic | ${tg} | ${tg_if1} | ${tg_if2}
+| | Send and receive traffic | ${tg} | ${tg_if2} | ${tg_if1}