X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Fl2xc_base%2Feth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot;fp=tests%2Ffunc%2Fl2_xconnect%2Fl2_xconnect_untagged.robot;h=583a5ba052e5458d280b1a58d023278420dd7a2d;hp=2554007ceff797459e0a6f026dd804cf18853090;hb=982e81efab69bc007455481b6425fcebc7213906;hpb=c232d04e7a5bffb72063240ee7e15967f46c4873

diff --git a/tests/func/l2_xconnect/l2_xconnect_untagged.robot b/tests/func/l2xc_base/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot
similarity index 57%
rename from tests/func/l2_xconnect/l2_xconnect_untagged.robot
rename to tests/func/l2xc_base/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot
index 2554007cef..583a5ba052 100644
--- a/tests/func/l2_xconnect/l2_xconnect_untagged.robot
+++ b/tests/func/l2xc_base/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot
@@ -21,21 +21,19 @@
 | Resource | resources/libraries/robot/qemu.robot
 | Library  | resources.libraries.python.Trace
 | Library | resources.libraries.python.NodePath
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV
+| Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV
 | Test Setup | Func Test Setup
 | Test Teardown | Func Test Teardown
 | Documentation | *L2 cross-connect test cases*
 | ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with
-| ... | single links between nodes; TG=DUT1=DUT2=TG 3-node circular topology
-| ... | with double parallel links and TG=DUT=VM 3-node topology with VM and
+| ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM and
 | ... | double parallel links.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of IPv4;
 | ... | Eth-IPv6-ICMPv6 for L2 switching of IPv6 use. Both apply to all links.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
-| ... | cross-connect (L2XC) switching.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect
+| ... | (L2XC) switching.
 | ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets are
-| ... | sent in both directions by TG on links to DUT1 and DUT2; on receive TG
+| ... | sent in both directions by TG on links to DUT1 via VM; on receive TG
 | ... | verifies packets for correctness and their IPv4 (IPv6) src-addr,
 | ... | dst-addr and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:*
@@ -45,45 +43,7 @@
 | ${sock2}= | /tmp/sock2
 
 *** Test Cases ***
-| TC01: DUT1 and DUT2 with L2XC switch ICMPv4 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT1 and \
-| | ... | DUT2 configure L2 cross-connect (L2XC), each with one interface
-| | ... | to TG and one Ethernet interface towards the other DUT. [Ver]
-| | ... | Make TG send ICMPv4 Echo Req in both directions between two of
-| | ... | its interfaces to be switched by DUT1 and DUT2; verify all
-| | ... | packets are received. [Ref]
-| | Given Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Interfaces in 3-node path are up
-| | And L2 setup xconnect on DUT
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2}
-| | And L2 setup xconnect on DUT
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
-| | Then Send and receive ICMPv4 bidirectionally
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
-
-| TC02: DUT1 and DUT2 with L2XC switch ICMPv6 between two TG links
-| | [Documentation]
-| | ... | [Top] TG-DUT1-DUT2-TG. [Enc] Eth-IPv6-ICMPv6. [Cfg] On DUT1 and \
-| | ... | DUT2 configure L2 cross-connect (L2XC), each with one interface
-| | ... | to TG and one Ethernet interface towards the other DUT. [Ver]
-| | ... | Make TG send ICMPv6 Echo Req in both directions between two of
-| | ... | its interfaces to be switched by DUT1 and DUT2; verify all
-| | ... | packets are received. [Ref]
-| | Given Path for 3-node testing is set
-| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Interfaces in 3-node path are up
-| | And L2 setup xconnect on DUT
-| | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2}
-| | And L2 setup xconnect on DUT
-| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
-| | Then Send and receive ICMPv6 bidirectionally
-| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
-
-| TC03: DUT with two L2XCs switches ICMPv4 between TG and local VM links
+| TC01: DUT with two L2XCs switches ICMPv4 between TG and local VM links
 | | [Documentation]
 | | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT configure \
 | | ... | two L2 cross-connects (L2XC), each with one untagged interface
@@ -91,7 +51,10 @@
 | | ... | TG send ICMPv4 Echo Reqs in both directions between two of its
 | | ... | i/fs to be switched by DUT to and from VM; verify all packets
 | | ... | are received. [Ref]
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV
+| | ...
+| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node}
+| | ... | AND | Func Test Teardown
+| | ...
 | | Given Path for 2-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Interfaces in 2-node path are up
@@ -104,12 +67,8 @@
 | | ...                                       | ${sock2}
 | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1}
 | | ...                                          | ${tg_to_dut_if2}
-| | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node}
-| | ... | AND | Show vpp trace dump on all DUTs
-| | ... | AND | Check VPP PID in Teardown
 
-| TC04: DUT with two L2XCs switches ICMPv6 between TG and local VM links
+| TC02: DUT with two L2XCs switches ICMPv6 between TG and local VM links
 | | [Documentation]
 | | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv6-ICMPv6. [Cfg] On DUT configure \
 | | ... | two L2 cross-connects (L2XC), each with one untagged i/f to TG
@@ -117,7 +76,10 @@
 | | ... | ICMPv6 Echo Reqs in both directions between two of its i/fs to
 | | ... | be switched by DUT to and from VM; verify all packets are
 | | ... | received. [Ref]
-| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV
+| | ...
+| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node}
+| | ... | AND | Func Test Teardown
+| | ...
 | | Given Path for 2-node testing is set
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Interfaces in 2-node path are up
@@ -130,8 +92,4 @@
 | | ...                                       | ${sock2}
 | | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1}
 | | ...                                          | ${tg_to_dut_if2}
-| | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node}
-| | ... | AND | Show vpp trace dump on all DUTs
-| | ... | AND | Check VPP PID in Teardown