From 08fc34b6ba780d227a1327274d434823118a4c77 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Wed, 19 Dec 2018 13:33:07 +0100 Subject: [PATCH] FIX: Avoid duplicated KW names in perf and func tests Change-Id: I66c68edf6e26fa7baa7bdc5f5d60d4d4aa3af6b9 Signed-off-by: Jan Gelety --- VPP_STABLE_VER_UBUNTU_BIONIC | 2 +- resources/libraries/robot/ip/ip4.robot | 28 +++++++++++----------- resources/libraries/robot/ip/ip6.robot | 28 +++++++++++----------- .../libraries/robot/shared/testing_path.robot | 4 ++-- .../vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot | 8 +++---- .../vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot | 8 +++---- .../device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot | 4 ++-- .../device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot | 4 ++-- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/VPP_STABLE_VER_UBUNTU_BIONIC b/VPP_STABLE_VER_UBUNTU_BIONIC index 6ef71b04bf..930ca7158f 100644 --- a/VPP_STABLE_VER_UBUNTU_BIONIC +++ b/VPP_STABLE_VER_UBUNTU_BIONIC @@ -1 +1 @@ -19.01-rc0~256-ga7dcae72~b1491 \ No newline at end of file +19.01-rc0~501-gbef3619d~b1737 \ No newline at end of file diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot index 02025156e2..def7d3212c 100644 --- a/resources/libraries/robot/ip/ip4.robot +++ b/resources/libraries/robot/ip/ip4.robot @@ -175,7 +175,7 @@ | | Run Traffic Script On Node | send_icmp_wait_for_reply.py | | ... | ${tg_node} | ${args} -| Initialize IPv4 forwarding in circular topology +| Configure IPv4 forwarding in circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node | | ... | circular topology. Get the interface MAC addresses and setup ARP on @@ -203,16 +203,16 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \| -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \ | | ... | \| remote_host1_ip4=192.168.0.1 \| remote_host2_ip4=192.168.0.2 \ | | ... | \| remote_host_ip4_prefix=32 \| -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \ | | ... | \| 20.20.20.1 \| -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \ | | ... | \| 20.20.20.1 \| remote_host1_ip4=192.168.0.1 \ | | ... | \| remote_host2_ip4=192.168.0.2 \| remote_host_ip4_prefix=32 \| @@ -222,24 +222,24 @@ | | ... | ${remote_host1_ip4}=${NONE} | ${remote_host2_ip4}=${NONE} | | ... | ${remote_host_ip4_prefix}=${NONE} | | ... -| | Set interfaces in path up +| | Configure interfaces in path up | | ... | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2_node} | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Initialize IPv4 forwarding in 3-node circular topology +| | ... | Configure IPv4 forwarding in 3-node circular topology | | ... | ${tg_if1_ip4} | ${tg_if2_ip4} | ${dut1_if1_ip4} | ${dut1_if2_ip4} | | ... | ${dut2_if1_ip4} | ${dut2_if2_ip4} | ${remote_host1_ip4} | | ... | ${remote_host2_ip4} | ${remote_host_ip4_prefix} | | ... | ELSE -| | ... | Initialize IPv4 forwarding in 2-node circular topology +| | ... | Configure IPv4 forwarding in 2-node circular topology | | ... | ${tg_if1_ip4} | ${tg_if2_ip4} | ${dut1_if1_ip4} | ${dut1_if2_ip4} | | ... | remote_host1_ip4=${remote_host1_ip4} | | ... | remote_host2_ip4=${remote_host2_ip4} | | ... | remote_host_ip4_prefix=${remote_host_ip4_prefix} -| Initialize IPv4 forwarding in 2-node circular topology +| Configure IPv4 forwarding in 2-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces on DUT node in 2-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on @@ -261,9 +261,9 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \| -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 20.20.20.1 \ | | ... | \| 192.168.0.1 \| 192.168.0.2 \| 32 \| | | ... @@ -290,7 +290,7 @@ | | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip4} | | ... | ${remote_host_ip4_prefix} | ${tg_if2_ip4} | ${dut_to_tg_if2} -| Initialize IPv4 forwarding in 3-node circular topology +| Configure IPv4 forwarding in 3-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP @@ -316,10 +316,10 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \ | | ... | \| 20.20.20.1 \| -| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| Configure IPv4 forwarding in circular topology \ | | ... | \| 10.10.10.2 \| 20.20.20.2 \| 10.10.10.1 \| 1.1.1.1 \| 1.1.1.2 \ | | ... | \| 20.20.20.1 \| 192.168.0.1 \| 192.168.0.2 \| 32 \| | | ... diff --git a/resources/libraries/robot/ip/ip6.robot b/resources/libraries/robot/ip/ip6.robot index f3e31b957b..b547e7d147 100644 --- a/resources/libraries/robot/ip/ip6.robot +++ b/resources/libraries/robot/ip/ip6.robot @@ -209,7 +209,7 @@ | | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr} | | | ... | ${dut1_if} -| Initialize IPv6 forwarding in circular topology +| Configure IPv6 forwarding in circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node | | ... | circular topology. Get the interface MAC addresses and setup ARP on @@ -237,16 +237,16 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \| -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \ | | ... | \| remote_host1_ip6=3ffe:5f::1 \| remote_host2_ip6=3ffe:5f::2 \ | | ... | \| remote_host_ip6_prefix=128 \| -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \ | | ... | \| 2001:2::1 \| -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \ | | ... | \| 2001:2::1 \| remote_host1_ip4=3ffe:5f::1 \ | | ... | \| remote_host2_ip4=3ffe:5f::2 \| remote_host_ip4_prefix=128 \| @@ -257,24 +257,24 @@ | | ... | ${remote_host_ip6_prefix}=${NONE} | | ... | | ... -| | Set interfaces in path up +| | Configure interfaces in path up | | ... | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2_node} | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Initialize IPv6 forwarding in 3-node circular topology +| | ... | Configure IPv6 forwarding in 3-node circular topology | | ... | ${tg_if1_ip6} | ${tg_if2_ip6} | ${dut1_if1_ip6} | ${dut1_if2_ip6} | | ... | ${dut2_if1_ip6} | ${dut2_if2_ip6} | ${remote_host1_ip6} | | ... | ${remote_host2_ip6} | ${remote_host_ip6_prefix} | | ... | ELSE -| | ... | Initialize IPv6 forwarding in 2-node circular topology +| | ... | Configure IPv6 forwarding in 2-node circular topology | | ... | ${tg_if1_ip6} | ${tg_if2_ip6} | ${dut1_if1_ip6} | ${dut1_if2_ip6} | | ... | remote_host1_ip6=${remote_host1_ip6} | | ... | remote_host2_ip6=${remote_host2_ip6} | | ... | remote_host_ip6_prefix=${remote_host_ip6_prefix} -| Initialize IPv6 forwarding in 2-node circular topology +| Configure IPv6 forwarding in 2-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces on DUT node in 2-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on @@ -296,9 +296,9 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \| -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2001:2::1 \ | | ... | \| remote_host1_ip6=3ffe:5f::1 \| remote_host2_ip6=3ffe:5f::2 \ | | ... | \| remote_host_ip6_prefix=128 \| @@ -326,7 +326,7 @@ | | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip6} | | ... | ${remote_host_ip6_prefix} | ${tg_if2_ip6} | ${dut_to_tg_if2} -| Initialize IPv6 forwarding in 3-node circular topology +| Configure IPv6 forwarding in 3-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP @@ -352,10 +352,10 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \ | | ... | \| 2001:2::1 \| -| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| Configure IPv6 forwarding in circular topology \ | | ... | \| 2001:1::2 \| 2001:2::2 \| 2001:1::1 \| 2003:3::1 \| 2003:3::2 \ | | ... | \| 2001:2::1 \| remote_host1_ip4=3ffe:5f::1 \ | | ... | \| remote_host2_ip4=3ffe:5f::2 \| remote_host_ip4_prefix=128 \| diff --git a/resources/libraries/robot/shared/testing_path.robot b/resources/libraries/robot/shared/testing_path.robot index ec0c856c81..2bd0d9f938 100644 --- a/resources/libraries/robot/shared/testing_path.robot +++ b/resources/libraries/robot/shared/testing_path.robot @@ -352,7 +352,7 @@ | | Vpp Node Interfaces Ready Wait | ${dut1_node} | | Vpp Node Interfaces Ready Wait | ${dut2_node} -| Set interfaces in path up +| Configure interfaces in path up | | [Documentation] | | ... | Set UP state on interfaces in 2-node or 3-node path on nodes and \ | | ... | wait until all interfaces are ready. @@ -369,7 +369,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Set interfaces in path up \| +| | ... | \| Configure interfaces in path up \| | | ... | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2} 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 -- 2.16.6