From 4fc12a553db78ff2ad293e7a87845b365a53d736 Mon Sep 17 00:00:00 2001 From: Matej Klotton Date: Wed, 2 Mar 2016 13:05:13 +0100 Subject: Move Send and receive L2 traffic KWs to standalone file. Change-Id: I3c919a15d5fdbf91ff493d64b768fb69b8c21b65 Signed-off-by: Matej Klotton --- tests/suites/bridge_domain/test.robot | 17 +++++++++-------- tests/suites/l2_xconnect/l2_xconnect_untagged.robot | 7 +++---- tests/suites/vxlan/vxlan_untagged.robot | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/suites/bridge_domain/test.robot b/tests/suites/bridge_domain/test.robot index a7f1104224..9695b7fe88 100644 --- a/tests/suites/bridge_domain/test.robot +++ b/tests/suites/bridge_domain/test.robot @@ -10,19 +10,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + *** Settings *** | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/interfaces.robot | Resource | resources/libraries/robot/bridge_domain.robot -| Force Tags | HW_ENV | VM_ENV +| Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.topology.Topology | Library | resources.libraries.python.NodePath | Variables | resources/libraries/python/topology.py +| Force Tags | HW_ENV | VM_ENV | Suite Setup | Setup all TGs before traffic script | Test Setup | Setup all DUTs before test *** Test Cases *** - | VPP reports interfaces | | VPP reports interfaces on | ${nodes['DUT1']} @@ -35,8 +36,8 @@ | | ${bd_if1} | ${tmp}= | First Ingress Interface | | ${bd_if2} | ${tmp}= | Last Egress Interface | | Vpp l2bd forwarding setup | ${nodes['DUT1']} | ${bd_if1} | ${bd_if2} -| | Send and receive traffic | ${nodes['TG']} | ${tg_if1} | ${tg_if2} -| | Send and receive traffic | ${nodes['TG']} | ${tg_if2} | ${tg_if1} +| | Send and receive ICMPv4 | ${nodes['TG']} | ${tg_if1} | ${tg_if2} +| | Send and receive ICMPv4 | ${nodes['TG']} | ${tg_if2} | ${tg_if1} | Vpp forwards packets via L2 bridge domain in circular topology | | [Tags] | 3_NODE_SINGLE_LINK_TOPO @@ -51,8 +52,8 @@ | | ${tg_if2} | ${tg}= | Next Interface | | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2} | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2} -| | Send and receive traffic | ${tg} | ${tg_if1} | ${tg_if2} -| | Send and receive traffic | ${tg} | ${tg_if2} | ${tg_if1} +| | Send and receive ICMPv4 | ${tg} | ${tg_if1} | ${tg_if2} +| | Send and receive ICMPv4 | ${tg} | ${tg_if2} | ${tg_if1} | Vpp forwards packets via L2 bridge domain in circular topology with static L2FIB entries | | [Tags] | 3_NODE_SINGLE_LINK_TOPO @@ -70,5 +71,5 @@ | | ... | ${mac} | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2} | ${FALSE} | | ... | ${mac} -| | Send and receive traffic | ${tg} | ${tg_if1} | ${tg_if2} -| | Send and receive traffic | ${tg} | ${tg_if2} | ${tg_if1} +| | Send and receive ICMPv4 | ${tg} | ${tg_if1} | ${tg_if2} +| | Send and receive ICMPv4 | ${tg} | ${tg_if2} | ${tg_if1} diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot index 0dd3251aca..cf32bfa076 100644 --- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot +++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot @@ -12,9 +12,9 @@ # limitations under the License. *** Settings *** - | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/l2_xconnect.robot +| Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.InterfaceUtil | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV @@ -23,7 +23,6 @@ *** Test Cases *** - | Vpp forwards packets via L2 xconnect in circular topology | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | Compute Path @@ -36,5 +35,5 @@ | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2} | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2} | | All Vpp Interfaces Ready Wait | ${nodes} -| | Send and receive traffic | ${tg} | ${tg_if1} | ${tg_if2} -| | Send and receive traffic | ${tg} | ${tg_if2} | ${tg_if1} +| | Send and receive ICMPv4 | ${tg} | ${tg_if1} | ${tg_if2} +| | Send and receive ICMPv4 | ${tg} | ${tg_if2} | ${tg_if1} diff --git a/tests/suites/vxlan/vxlan_untagged.robot b/tests/suites/vxlan/vxlan_untagged.robot index fe4428210d..45d57a902d 100644 --- a/tests/suites/vxlan/vxlan_untagged.robot +++ b/tests/suites/vxlan/vxlan_untagged.robot @@ -14,8 +14,8 @@ *** Settings *** | Documentation | VXLAN tunnel untagged traffic tests | Resource | resources/libraries/robot/default.robot -| Resource | resources/libraries/robot/bridge_domain.robot | Resource | resources/libraries/robot/vxlan.robot +| Resource | resources/libraries/robot/l2_traffic.robot | Force Tags | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING | Suite Setup | Run Keywords | Setup all DUTs before test | ... | AND | Setup all TGs before traffic script @@ -24,4 +24,4 @@ *** Test Cases *** | VPP can encapsulate L2 in VXLAN over V4 -| | Send and receive traffic | ${nodes['TG']} | ${tgs_to_dut1} | ${tgs_to_dut2} +| | Send and receive ICMPv4 | ${nodes['TG']} | ${tgs_to_dut1} | ${tgs_to_dut2} -- cgit 1.2.3-korg