diff options
author | Tibor Frank <tifrank@cisco.com> | 2017-06-08 14:45:26 +0200 |
---|---|---|
committer | Tibor Frank <tifrank@cisco.com> | 2017-06-13 09:00:09 +0200 |
commit | 53d69321e41aa6fd94abc16c7050314dc2e53f08 (patch) | |
tree | 21977de9cc93e53eb2625224262e583a3476bc91 /tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot | |
parent | 5f6802ba1d16005e7562f0eace81512dddab6762 (diff) |
CSIT-664: Refactor setups and teardowns
- Add suite setup for performance IPSec tests
- Add test teardown for performance SNAT tests
- Add setups and teardowns for functional tests
- Clean up the code
Change-Id: Ia456e9f3ff0f0f2bb9a03f692f27c7f9a2817621
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot')
-rw-r--r-- | tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot | 18 |
1 files changed, 8 insertions, 10 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 0763b88142..d593fdf4d0 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 @@ -59,14 +59,13 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | When Configure vhost interfaces for L2BD forwarding | ${dut_node} -| | ... | ${sock1} -| | ... | ${sock2} +| | ... | ${sock1} | ${sock2} | | 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 ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if2} +| | ... | ${sock2} +| | 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 | | [Documentation] @@ -84,12 +83,11 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | When Configure vhost interfaces for L2BD forwarding | ${dut_node} -| | ... | ${sock1} -| | ... | ${sock2} +| | ... | ${sock1} | ${sock2} | | 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 ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if2} +| | ... | ${sock2} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} |