X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fdevice%2Fl2bd%2Feth2p-eth-l2bdbasemaclrn-dev.robot;h=44e3f0147e0b2c0f84f88887dec7828210c3f836;hp=2eca31931eccb3c6ff68d5cd4f9ae25b48fefb33;hb=ccef9f4e7e2e8cb04cb2de5e43e59d4fd15cf8b6;hpb=08fc34b6ba780d227a1327274d434823118a4c77

diff --git a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot
index 2eca31931e..44e3f0147e 100644
--- a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot
@@ -12,48 +12,54 @@
 # limitations under the License.
 
 *** Settings ***
+| Library | resources.libraries.python.L2Util
+| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
 | Resource | resources/libraries/robot/l2/l2_traffic.robot
-| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/shared/interfaces.robot
 | Resource | resources/libraries/robot/shared/testing_path.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
 | ... | FUNCTEST | L2BDMACLRN | BASE | ETH | ICMP
 | ...
-| Test Setup | Set up VPP device test
-| ...
-| Test Teardown | Tear down VPP device test
+| Suite Setup | Setup suite single link
+| Test Setup | Setup test
+| Test Teardown | Tear down test | packet_trace
 | ...
 | Documentation | *L2 bridge-domain test cases*
 | ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of\
-| ... | IPv4; Eth-IPv6-ICMPv6 for L2 switching of IPv6 use. Both apply to all\
+| ... | *[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 is configured with L2 bridge-domain\
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain \
 | ... | switching.
-| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets\
-| ... | are sent in both directions by TG on links to DUT1; on receive TG\
-| ... | verifies packets for correctness and their IPv4 (IPv6) src-addr,\
+| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets \
+| ... | are sent in both directions by TG on links to DUT1; on receive TG \
+| ... | verifies packets for correctness and their IPv4 (IPv6) src-addr, \
 | ... | dst-addr and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC792
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
 | ${bd_id}= | 1
 
 *** Test Cases ***
 | tc01-eth2p-ethicmpv4-l2bdbase-device
 | | [Documentation]
 | | ... | [Top] TG-DUT1-TG. [Enc] Eth-IPv4-ICMPv4.
-| | ... | [Cfg] Configure L2 bridge-domain (L2BD) with MAC learning enabled on\
+| | ... | [Cfg] Configure L2 bridge-domain (L2BD) with MAC learning enabled on \
 | | ... | DUT1. Add both interfaces towards TG to this L2BD.
-| | ... | [Ver] Make TG send ICMPv4 Echo Req in both directions between two of\
-| | ... | its interfaces to be switched by DUT1; verify all packets are\
+| | ... | [Ver] Make TG send ICMPv4 Echo Req in both directions between two of \
+| | ... | its interfaces to be switched by DUT1; verify all packets are \
 | | ... | received.
 | | ...
-| | Given Configure path in 2-node circular topology
+| | Given Add PCI devices to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP Enable Traces On All Duts | ${nodes}
+| | When Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Configure interfaces in path up
 | | And Create bridge domain | ${dut_node} | ${bd_id}
@@ -61,20 +67,26 @@
 | | ... | ${bd_id}
 | | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${bd_id}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
+| | And All Vpp Interfaces Ready Wait | ${nodes}
 | | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | ...
+| | And VPP get bridge domain data | ${nodes['DUT1']}
+| | And Get L2 Fib Table | ${nodes['DUT1']} | ${bd_id}
 
 | tc02-eth2p-ethicmpv6-l2bdbase-device
 | | [Documentation]
 | | ... | [Top] TG-DUT1-TG. [Enc] Eth-IPv6-ICMPv6.
-| | ... | [Cfg] Configure L2 bridge-domain (L2BD) with MAC learning enabled on\
+| | ... | [Cfg] Configure L2 bridge-domain (L2BD) with MAC learning enabled on \
 | | ... | DUT1. Add both interfaces towards TG to this L2BD.
-| | ... | [Ver] Make TG send ICMPv6 Echo Req in both directions between two of\
-| | ... | its interfaces to be switched by DUT1; verify all packets are\
+| | ... | [Ver] Make TG send ICMPv6 Echo Req in both directions between two of \
+| | ... | its interfaces to be switched by DUT1; verify all packets are \
 | | ... | received.
 | | ...
-| | Given Configure path in 2-node circular topology
+| | Given Add PCI devices to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP Enable Traces On All Duts | ${nodes}
+| | When Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | And Configure interfaces in path up
 | | And Create bridge domain | ${dut_node} | ${bd_id}
@@ -82,6 +94,7 @@
 | | ... | ${bd_id}
 | | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2}
 | | ... | ${bd_id}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
+| | And All Vpp Interfaces Ready Wait | ${nodes}
 | | Then Send ICMPv6 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | VPP get bridge domain data | ${nodes['DUT1']} | bd_id=${bd_id}