X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fdevice%2Finterfaces%2Feth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot;h=3e7fd03e895592fd6b9a4ab601af23f716890e7d;hp=f7a0fbe1539adb0fad77839003ed71cf76f9008b;hb=533fcfe3d177447aee7a3dca5f0d7a5f06d70377;hpb=d5e7718b186ff98d0d1011bded653e86db263c50

diff --git a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
index f7a0fbe153..3e7fd03e89 100644
--- a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
@@ -13,28 +13,16 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/ip/ip4.robot
-| Resource | resources/libraries/robot/ip/ip6.robot
-| Resource | resources/libraries/robot/shared/interfaces.robot
-| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/shared/testing_path.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| Library  | resources.libraries.python.Trace
-| Library  | resources.libraries.python.Tap
-| Library  | resources.libraries.python.Namespaces
-| Library  | resources.libraries.python.IPUtil
 | ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
-| ... | FUNCTEST | L2BD | BASE | ETH | TAP
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
+| ... | NIC_Virtual | ETH | L2BD | BASE | TAP
 | ...
-| Test Setup | Run Keywords | Set up VPP device test
-| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
-| ...
-| Test Teardown | Run Keywords | Tear down VPP device test
-| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
-| ... | AND | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP}
+| Suite Setup | Setup suite single link | scapy
+| Test Setup | Setup test | namespace
+| Test Teardown | Tear down test | packet_trace | namespace | linux_bridge
 | ...
 | Documentation | *Tap Interface Traffic Tests*
+| ...
 | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
 | ... | between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of
@@ -49,42 +37,35 @@
 | ... | *[Ref] Applicable standard specifications:*
 
 *** Variables ***
-| ${bid_from_TG}= | 19
-| ${bid_to_TG}= | 20
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
+| ${overhead}= | ${0}
 | ${bid_TAP}= | tapBr
 
-| ${tap_int1}= | tap0
-| ${tap_int2}= | tap1
-
 *** Test Cases ***
-| tc01-eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-device_tap-simple-bd
+| tc01-eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev_tap-simple-bd
 | | [Documentation]
-| | ... | [Cfg] On DUT1 configure two L2BD with two if's for each L2BD with MAC\
-| | ... | learning and one L2BD joining two linux-TAP interfaces created by VPP\
-| | ... | located in namespace.
 | | ... | [Ver] Packet sent from TG is passed through all L2BD and received\
 | | ... | back on TG. Then src_ip, dst_ip and MAC are checked.
 | | ...
-| | Given Configure path in 2-node circular topology | ${nodes['TG']}
-| | ... | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set interfaces in 2-node circular topology up
-| | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1}
-| | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2}
-| | And Set Interface State | ${dut_node} | ${int1} | up
-| | And Set Interface State | ${dut_node} | ${int2} | up
-| | And Create bridge domain | ${dut_node}
-| | ... | ${bid_from_TG} | learn=${TRUE}
-| | And Create bridge domain | ${dut_node}
-| | ... | ${bid_to_TG} | learn=${TRUE}
-| | And Linux Add Bridge | ${dut_node}
-| | ... | ${bid_TAP} | ${tap_int1} | ${tap_int2}
-| | And Add interface to bridge domain | ${dut_node}
-| | ... | ${int1} | ${bid_to_TG} | 0
-| | And Add interface to bridge domain | ${dut_node}
-| | ... | ${dut_to_tg_if1} | ${bid_to_TG} | 0
-| | And Add interface to bridge domain | ${dut_node}
-| | ... | ${int2} | ${bid_from_TG} | 0
-| | And Add interface to bridge domain | ${dut_node}
-| | ... | ${dut_to_tg_if2} | ${bid_from_TG} | 0
-| | Then Send ICMP packet and verify received packet | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
\ No newline at end of file
+| | Set Test Variable | ${frame_size} | ${42}
+| | Set Test Variable | ${rxq_count_int} | ${1}
+| | ...
+| | Given Add PCI devices to all DUTs
+| | And Set Max Rate And Jumbo And Handle Multi Seg
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP Enable Traces On All Duts | ${nodes}
+| | When Set interfaces in path up
+| | ${int1}= | And Add Tap Interface | ${dut1} | tap0
+| | ${int2}= | And Add Tap Interface | ${dut1} | tap1
+| | And Set Interface State | ${dut1} | ${int1} | up
+| | And Set Interface State | ${dut1} | ${int2} | up
+| | And Create bridge domain | ${dut1} | 19 | learn=${TRUE}
+| | And Create bridge domain | ${dut1} | 20 | learn=${TRUE}
+| | And Linux Add Bridge | ${dut1} | ${bid_TAP} | tap0 | tap1
+| | And Add interface to bridge domain | ${dut1} | ${int1} | 20 | 0
+| | And Add interface to bridge domain | ${dut1} | ${dut1_if1} | 20 | 0
+| | And Add interface to bridge domain | ${dut1} | ${int2} | 19 | 0
+| | And Add interface to bridge domain | ${dut1} | ${dut1_if2} | 19 | 0
+| | Then Send ICMP packet and verify received packet
+| | ... | ${tg} | ${tg_if1} | ${tg_if2}