From 71b27a0864f4e02f8750de23fb6498369696734c Mon Sep 17 00:00:00 2001 From: Patrik Hrnciar Date: Thu, 18 Feb 2016 10:05:05 +0100 Subject: Update l2_xconnect test to use NodePath Change-Id: I9951a7e9a36dbc78c44f6bd868b4f6531ecb3349 Signed-off-by: Patrik Hrnciar --- .../suites/l2_xconnect/l2_xconnect_untagged.robot | 28 +++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'tests/suites') diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot index 286a63e9f4..f6c1cbdd72 100644 --- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot +++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot @@ -15,19 +15,25 @@ | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/l2_xconnect.robot +| Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_SINGLE_LINK_TOPO -| Suite Setup | Run Keywords | Setup all DUTs before test -| ... | AND | Setup all TGs before traffic script -| ... | AND | Interfaces on all DUTs are in "up" state +| Test Setup | Setup all DUTs before test +| Suite Setup | Setup all TGs before traffic script + *** Test Cases *** -| VPP forwards packets through xconnect in circular topology -| | Given L2 setup xconnect on DUTs -| | ${tg}= | Set Variable | ${nodes['TG']} -| | ${dut1}= | Set Variable | ${nodes['DUT1']} -| | ${dut2}= | Set Variable | ${nodes['DUT2']} -| | ${tg_links}= | Get traffic links between TG "${tg}" and DUT1 "${dut1}" and DUT2 "${dut2}" +| Vpp forwards packets via L2 xconnect in circular topology +| | [Tags] | 3_NODE_SINGLE_LINK_TOPO +| | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} +| | Compute Path +| | ${src_if} | ${tg}= | Next Interface +| | ${dut1_if1} | ${dut1}= | Next Interface +| | ${dut1_if2} | ${dut1}= | Next Interface +| | ${dut2_if1} | ${dut2}= | Next Interface +| | ${dut2_if2} | ${dut2}= | Next Interface +| | ${dst_if} | ${tg}= | Next Interface +| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2} +| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2} | | Sleep | 10 | Work around VPP interface up taking too long. -| | Send traffic on node "${nodes['TG']}" from link "${tg_links[0]}" to link "${tg_links[1]}" - +| | Send and receive traffic | ${tg} | ${src_if} | ${dst_if} -- cgit 1.2.3-korg