diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2018-12-19 13:33:07 +0100 |
|---|---|---|
| committer | Jan Gelety <jgelety@cisco.com> | 2018-12-19 13:55:29 +0100 |
| commit | 08fc34b6ba780d227a1327274d434823118a4c77 (patch) | |
| tree | af2844dd49274c04512ec32430b8a8f9d7e93efb /tests/vpp/device | |
| parent | f655cd2104acc4b54de9c481d4370bf5f478ea0c (diff) | |
FIX: Avoid duplicated KW names in perf and func tests
Change-Id: I66c68edf6e26fa7baa7bdc5f5d60d4d4aa3af6b9
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'tests/vpp/device')
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot index 4ae23528f6..3456079b8e 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot @@ -56,7 +56,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} +| | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} | | When All Vpp Interfaces Ready Wait | ${nodes} | | Then Send IPv4 ping packet and verify headers | ${tg_node} @@ -73,7 +73,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} +| | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} | | When All Vpp Interfaces Ready Wait | ${nodes} | | Then Send IPv4 ping packet and verify headers | ${tg_node} @@ -91,7 +91,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} +| | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} | | When All Vpp Interfaces Ready Wait | ${nodes} | | Then Send IPv4 ping packet and verify headers | ${tg_node} @@ -109,7 +109,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} +| | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} | | ... | remote_host1_ip4=${remote_host1_ip4} | | ... | remote_host2_ip4=${remote_host2_ip4} diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot index c045acd06b..e1ba73bf68 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot @@ -56,7 +56,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} +| | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} | | And Suppress ICMPv6 router advertisement message | ${nodes} | | When All Vpp Interfaces Ready Wait | ${nodes} @@ -74,7 +74,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} +| | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} | | And Suppress ICMPv6 router advertisement message | ${nodes} | | When All Vpp Interfaces Ready Wait | ${nodes} @@ -93,7 +93,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} +| | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} | | And Suppress ICMPv6 router advertisement message | ${nodes} | | When All Vpp Interfaces Ready Wait | ${nodes} @@ -112,7 +112,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Initialize IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} +| | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} | | ... | remote_host1_ip6=${remote_host1_ip6} | | ... | remote_host2_ip6=${remote_host2_ip6} diff --git a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot index 553ed17029..2eca31931e 100644 --- a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot @@ -55,7 +55,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set interfaces in path up +| | And Configure interfaces in path up | | And Create bridge domain | ${dut_node} | ${bd_id} | | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id} @@ -76,7 +76,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set interfaces in path up +| | And Configure interfaces in path up | | And Create bridge domain | ${dut_node} | ${bd_id} | | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id} diff --git a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot index 19920e604c..541744847c 100644 --- a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot +++ b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot @@ -51,7 +51,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set interfaces in path up +| | And Configure interfaces in path up | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} | | When All Vpp Interfaces Ready Wait | ${nodes} | | Then Send ICMPv4 bidirectionally and verify received packets @@ -68,7 +68,7 @@ | | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set interfaces in path up +| | And Configure interfaces in path up | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} | | When All Vpp Interfaces Ready Wait | ${nodes} | | Then Send ICMPv6 bidirectionally and verify received packets |