aboutsummaryrefslogtreecommitdiffstats
path: root/tests/func
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2017-06-16 09:38:28 +0200
committerTibor Frank <tifrank@cisco.com>2017-06-26 12:37:26 +0000
commit41bded220766aad6f805a9864ef677abe9ff9004 (patch)
tree6df32095797eccd6e9e039d0fefaf773d67455cd /tests/func
parent2f55e281e2b8f820bfb5939172ba45bbcce6a7fa (diff)
CSIT-683: Re-organize L2 libraries - func
Change-Id: I5444dfba68ea41d8190d6615e23505f3c08c377c Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'tests/func')
-rw-r--r--tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot3
-rw-r--r--tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot22
2 files changed, 13 insertions, 12 deletions
diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot
index 93367d459c..096c0eb38e 100644
--- a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot
+++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot
@@ -16,6 +16,7 @@
| Resource | resources/libraries/robot/bridge_domain.robot
| Resource | resources/libraries/robot/testing_path.robot
| Resource | resources/libraries/robot/qemu.robot
+| Resource | resources/libraries/robot/interfaces.robot
| Library | resources.libraries.python.Trace
| Force Tags | HW_ENV | VM_ENV | SKIP_VPP_PATCH
| Test Setup | Set up functional test
@@ -46,7 +47,7 @@
| | ... | [Top] TG=DUT1; TG-DUT1-DUT2-TG. [Enc] None. [Cfg] Discovered \
| | ... | active interfaces. [Ver] Report active interfaces on DUT. [Ref]
| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | 3_NODE_SINGLE_LINK_TOPO
-| | Report VPP interfaces | ${nodes['DUT1']}
+| | VPP reports interfaces through VAT on '${nodes['DUT1']}'
| TC02: DUT with L2BD (MAC learning) switch ICMPv4 between two TG links
| | [Documentation]
diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot
index 70f17bc368..83985cdb00 100644
--- a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot
+++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot
@@ -16,6 +16,7 @@
| Resource | resources/libraries/robot/testing_path.robot
| Resource | resources/libraries/robot/vxlan.robot
| Resource | resources/libraries/robot/l2_traffic.robot
+| Resource | resources/libraries/robot/l2_xconnect.robot
| Library | resources.libraries.python.Trace
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
| Test Setup | Set up functional test
@@ -49,18 +50,17 @@
| | ... | interfaces; verify all packets are received. [Ref] RFC7348.
| | Given Configure path in 3-node circular topology
| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
-| | And Set interfaces in 3-node circular topology up
+| | And Set interfaces in 3-node circular topology up
| | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2}
| | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1}
-| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
-| | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE}
-| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI}
-| | | ... | ${dut1s_ip_address} | ${dut2s_ip_address}
-| | And Add interfaces to L2XC | ${dut1_node}
-| | ... | ${dut1_to_tg} | ${dut1s_vxlan}
-| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI}
-| | | ... | ${dut2s_ip_address} | ${dut1s_ip_address}
-| | And Add interfaces to L2XC | ${dut2_node}
-| | ... | ${dut2_to_tg} | ${dut2s_vxlan}
+| | And Configure IP addresses and neighbors on interfaces
+| | ... | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE}
+| | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE}
+| | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI}
+| | | ... | ${dut1s_ip_address} | ${dut2s_ip_address}
+| | And Configure L2XC | ${dut1_node} | ${dut1_to_tg} | ${dut1s_vxlan}
+| | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI}
+| | | ... | ${dut2s_ip_address} | ${dut1s_ip_address}
+| | And Configure L2XC | ${dut2_node} | ${dut2_to_tg} | ${dut2s_vxlan}
| | Then Send ICMPv4 bidirectionally and verify received packets
| | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}