diff options
Diffstat (limited to 'tests/func/l2xc')
| -rw-r--r-- | tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot | 40 | ||||
| -rw-r--r-- | tests/func/l2xc/eth2p-eth-l2xcbase-func.robot | 24 |
2 files changed, 32 insertions, 32 deletions
diff --git a/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot index 583a5ba052..0763b88142 100644 --- a/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot +++ b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM and @@ -52,20 +52,20 @@ | | ... | i/fs to be switched by DUT to and from VM; verify all packets | | ... | are received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC02: DUT with two L2XCs switches ICMPv6 between TG and local VM links @@ -77,19 +77,19 @@ | | ... | be switched by DUT to and from VM; verify all packets are | | ... | received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} diff --git a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot index 9aa606a0c9..2c4f4625e6 100644 --- a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot +++ b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -47,15 +47,15 @@ | | ... | Make TG send ICMPv4 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When All Vpp Interfaces Ready Wait | ${nodes} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC02: DUT1 and DUT2 with L2XC switch ICMPv6 between two TG links @@ -66,13 +66,13 @@ | | ... | Make TG send ICMPv6 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When All Vpp Interfaces Ready Wait | ${nodes} -| | Then Send and receive ICMPv6 bidirectionally +| | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} |