From d1f514dc71e263761ad5688c76d6cdd40ac1308b Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 8 Aug 2019 11:20:49 +0000 Subject: [PATCH] Clean: Interface Keywords Signed-off-by: Peter Mikus Change-Id: Ideddcea56120cf770aec78ca24813baf7d05ba11 (cherry picked from commit 484cb0bddf8ad75129ac20b955a72f36f4241ad2) --- resources/libraries/robot/ip/map.robot | 312 --------------------- .../performance/performance_configuration.robot | 192 ++----------- resources/libraries/robot/shared/default.robot | 9 + resources/libraries/robot/shared/interfaces.robot | 88 ++++-- 4 files changed, 97 insertions(+), 504 deletions(-) delete mode 100644 resources/libraries/robot/ip/map.robot diff --git a/resources/libraries/robot/ip/map.robot b/resources/libraries/robot/ip/map.robot deleted file mode 100644 index ac086b4511..0000000000 --- a/resources/libraries/robot/ip/map.robot +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -*** Settings *** -| Variables | resources/libraries/python/topology.py -| Library | resources.libraries.python.topology.Topology -| Library | resources.libraries.python.DUTSetup -| Library | resources.libraries.python.TGSetup -| Library | resources.libraries.python.Map -| Documentation | Keywords for MAP feature in VPP. - -*** Keywords *** -| Send IPv4 UDP and check headers for lightweight 4over6 -| | [Documentation] -| | ... | Send empty UDP to given IPv4 dst and UDP port and check received \ -| | ... | packets headers (Ethernet, IPv6, IPv4, UDP). -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - Node where to run traffic script. Type: string -| | ... | - tx_if - Interface from where to send ICPMv4 packet. Type: string -| | ... | - rx_if - Interface where to receive IPinIP packet. Type: string -| | ... | - tx_dst_mac - Destination MAC address of IPv4 packet. Type: string -| | ... | - tx_dst_ipv4 - Destination IPv4 address. Type: string -| | ... | - tx_src_ipv4 - Source IPv4 address. Type: string -| | ... | - tx_dst_udp_port - Destination UDP port. Type: integer -| | ... | - rx_dst_mac - Expected destination MAC address. Type: string -| | ... | - rx_src_mac - Expected source MAC address. Type: string -| | ... | - dst_ipv6 - Expected destination IPv6 address. Type: string -| | ... | - src_ipv6 - Expected source IPv6 address. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send IPv4 UDP and check headers for lightweight 4over6 \ -| | ... | \| ${tg_node} \| eth3 \| eth2 \| 08:00:27:66:b8:57 \| 20.0.0.1 \ -| | ... | \| 20.0.0.2 \| 1232 \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \ -| | ... | \| 2001:1::2 \| 2001:1::1 \| -| | ... -| | [Arguments] -| | ... | ${tg_node} | ${tx_if} | ${rx_if} | ${tx_dst_mac} | ${tx_dst_ipv4} -| | ... | ${tx_src_ipv4} | ${tx_dst_udp_port} | ${rx_dst_mac} | ${rx_src_mac} -| | ... | ${dst_ipv6} | ${src_ipv6} -| | ... -| | ${tx_name}= | Get interface name | ${tg_node} | ${tx_if} -| | ${rx_name}= | Get interface name | ${tg_node} | ${rx_if} -| | ${args}= | Catenate -| | ... | --tx_if | ${tx_name} | --rx_if | ${rx_name} -| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_ipv4 | ${tx_src_ipv4} -| | ... | --tx_dst_ipv4 | ${tx_dst_ipv4} -| | ... | --tx_dst_udp_port | ${tx_dst_udp_port} -| | ... | --rx_dst_mac | ${rx_dst_mac} | --rx_src_mac | ${rx_src_mac} -| | ... | --src_ipv6 | ${src_ipv6} | --dst_ipv6 | ${dst_ipv6} -| | ... -| | Run Traffic Script On Node -| | ... | send_ipv4_udp_check_lw_4o6.py | ${tg_node} | ${args} - -| Send IPv4 ICMP and check headers for lightweight 4over6 -| | [Documentation] -| | ... | Send ICMP request with ID to given IPv4 destination and \ -| | ... | check received packets headers (Ethernet, IPv6, IPv4, ICMP). -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - Node where to run traffic script. Type: string -| | ... | - tx_if - Interface from where to send ICPMv4 packet. Type: string -| | ... | - rx_if - Interface where to receive IPinIP packet. Type: string -| | ... | - tx_dst_mac - Destination MAC address of IPv4 packet. Type: string -| | ... | - tx_dst_ipv4 - Destination IPv4 address. Type: string -| | ... | - tx_src_ipv4 - Source IPv4 address. Type: string -| | ... | - tx_icmp_id - ICMP ID. Type: integer -| | ... | - rx_dst_mac - Expected destination MAC address. Type: string -| | ... | - rx_src_mac - Expected source MAC address. Type: string -| | ... | - dst_ipv6 - Expected destination IPv6 address. Type: string -| | ... | - src_ipv6 - Expected source IPv6 address. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send IPv4 ICMP and check headers for lightweight 4over6 \ -| | ... | \| ${tg_node} \| eth3 \| eth2 \| 08:00:27:66:b8:57 \| 20.0.0.1 \ -| | ... | \| 20.0.0.2 \| 1232 \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \ -| | ... | \| 2001:1::2 \| 2001:1::1 \| -| | ... -| | [Arguments] -| | ... | ${tg_node} | ${tx_if} | ${rx_if} | ${tx_dst_mac} | ${tx_dst_ipv4} -| | ... | ${tx_src_ipv4} | ${tx_icmp_id} | ${rx_dst_mac} | ${rx_src_mac} -| | ... | ${dst_ipv6} | ${src_ipv6} -| | ... -| | ${tx_name}= | Get interface name | ${tg_node} | ${tx_if} -| | ${rx_name}= | Get interface name | ${tg_node} | ${rx_if} -| | ${args}= | Catenate -| | ... | --tx_if | ${tx_name} | --rx_if | ${rx_name} -| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_ipv4 | ${tx_src_ipv4} -| | ... | --tx_dst_ipv4 | ${tx_dst_ipv4} | --tx_icmp_id | ${tx_icmp_id} -| | ... | --rx_dst_mac | ${rx_dst_mac} | --rx_src_mac | ${rx_src_mac} -| | ... | --src_ipv6 | ${src_ipv6} | --dst_ipv6 | ${dst_ipv6} -| | ... -| | Run Traffic Script On Node -| | ... | send_ipv4_icmp_check_lw_4o6.py | ${tg_node} | ${args} - -| Send IPv4 UDP in IPv6 and check headers for lightweight 4over6 -| | [Documentation] -| | ... | Send empty UDP in IPv4 in IPv6 and check if IPv4 packet is correctly \ -| | ... | decapsulated from IPv6. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - Node where to run traffic script. Type: string -| | ... | - tx_if - Interface from where to send ICPMv4 packet. Type: string -| | ... | - rx_if - Interface where to receive IPinIP packet. Type: string -| | ... | - tx_dst_mac - Destination MAC address of IPv4 packet. Type: string -| | ... | - tx_src_mac - Source MAC address of IPv4 packet. Type: string -| | ... | - tx_dst_ipv6 - Destination IPv6 address. Type: string -| | ... | - tx_src_ipv6 - Source IPv6 address. Type: string -| | ... | - tx_dst_ipv4 - Destination IPv4 address. Type: string -| | ... | - tx_src_ipv4 - Source IPv4 address. Type: string -| | ... | - tx_src_udp_port - Source UDP port. Type: integer -| | ... | - rx_dst_mac - Expected destination MAC address. Type: string -| | ... | - rx_src_mac - Expected source MAC address. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send IPv4 UDP in IPv6 and check headers for lightweight 4over6 \ -| | ... | \| ${tg_node} \| eth3 \| eth2 \ -| | ... | \| 08:00:27:66:b8:57 \| 08:00:27:33:54:21 \ -| | ... | \| 2001:1::2 \| 2001:1::1 \| 20.0.0.1 \| 20.0.0.2 \ -| | ... | \| 1232 \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \| -| | ... -| | [Arguments] -| | ... | ${tg_node} | ${tx_if} | ${rx_if} | ${tx_dst_mac} | ${tx_src_mac} -| | ... | ${tx_dst_ipv6} | ${tx_src_ipv6} | ${tx_dst_ipv4} | ${tx_src_ipv4} -| | ... | ${tx_src_udp_port} | ${rx_dst_mac} | ${rx_src_mac} -| | ... -| | ${tx_name}= | Get interface name | ${tg_node} | ${tx_if} -| | ${rx_name}= | Get interface name | ${tg_node} | ${rx_if} -| | ${args}= | Catenate -| | ... | --tx_if | ${tx_name} | --rx_if | ${rx_name} -| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_mac | ${tx_src_mac} -| | ... | --tx_dst_ipv6 | ${tx_dst_ipv6} | --tx_src_ipv6 | ${tx_src_ipv6} -| | ... | --tx_dst_ipv4 | ${tx_dst_ipv4} | --tx_src_ipv4 | ${tx_src_ipv4} -| | ... | --tx_src_udp_port | ${tx_src_udp_port} -| | ... | --rx_dst_mac | ${rx_dst_mac} | --rx_src_mac | ${rx_src_mac} -| | ... -| | Run Traffic Script On Node -| | ... | send_lw_4o6_check_ipv4_udp.py | ${tg_node} | ${args} - -| Send IPv4 UDP in IPv6 and check headers for lightweight hairpinning -| | [Documentation] -| | ... | Send empty UDP in IPv4 in IPv6 and check if IPv4 packet is correctly \ -| | ... | decapsulated and re-encapsulated to another lwB4. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - Node where to run traffic script. Type: string -| | ... | - tx_if - Interface from where to send ICPMv4 packet. Type: string -| | ... | - rx_if - Interface where to receive IPinIP packet. Type: string -| | ... | - tx_dst_mac - Destination MAC address of send IPv6 packet. \ -| | ... | Type: string -| | ... | - tx_dst_ipv6 - Destination IPv6 address (lwAFTR). Type: string -| | ... | - tx_src_ipv6 - Source IPv6 address (lwB4_1). Type: string -| | ... | - tx_dst_ipv4 - Destination IPv4 address. Type: string -| | ... | - tx_src_ipv4 - Source IPv4 address. Type: string -| | ... | - tx_dst_udp_port - Destination UDP port (PSID_2 related). \ -| | ... | Type: integer -| | ... | - tx_src_udp_port - Source UDP port (PSID_1 related). Type: integer -| | ... | - rx_dst_mac - Expected destination MAC address. Type: string -| | ... | - rx_src_mac - Expected source MAC address. Type: string -| | ... | - rx_dst_ipv6 - Expected destination IPv6 address (lwB4_2). \ -| | ... | Type: string -| | ... | - rx_src_ipv6 - Expected source IPv6 address (lwAFTR). Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send IPv4 UDP in IPv6 and check headers for lightweight hairpinning \ -| | ... | \| ${tg_node} \| port3 \| port3 \| 08:00:27:f3:be:f0 \| 2001:1::1 \ -| | ... | \| 2001:1::2 \| 20.0.0.1 \| 20.0.0.1 \| ${6232} \| ${1232} \ -| | ... | \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \| 2001:1::3 \| 2001:1::1 \| -| | ... -| | [Arguments] -| | ... | ${tg_node} | ${tx_if} | ${rx_if} -| | ... | ${tx_dst_mac} -| | ... | ${tx_dst_ipv6} | ${tx_src_ipv6} -| | ... | ${tx_dst_ipv4} | ${tx_src_ipv4} -| | ... | ${tx_dst_udp_port} | ${tx_src_udp_port} -| | ... | ${rx_dst_mac} | ${rx_src_mac} -| | ... | ${rx_dst_ipv6} | ${rx_src_ipv6} -| | ... -| | ${tx_name}= | Get interface name | ${tg_node} | ${tx_if} -| | ${rx_name}= | Get interface name | ${tg_node} | ${rx_if} -| | ${args}= | Catenate -| | ... | --tx_if | ${tx_name} | --rx_if | ${rx_name} -| | ... | --tx_dst_mac | ${tx_dst_mac} -| | ... | --tx_dst_ipv6 | ${tx_dst_ipv6} | --tx_src_ipv6 | ${tx_src_ipv6} -| | ... | --tx_dst_ipv4 | ${tx_dst_ipv4} | --tx_src_ipv4 | ${tx_src_ipv4} -| | ... | --tx_dst_udp_port | ${tx_dst_udp_port} -| | ... | --tx_src_udp_port | ${tx_src_udp_port} -| | ... | --rx_dst_mac | ${rx_dst_mac} | --rx_src_mac | ${rx_src_mac} -| | ... | --rx_dst_ipv6 | ${rx_dst_ipv6} | --rx_src_ipv6 | ${rx_src_ipv6} -| | ... -| | Run Traffic Script On Node -| | ... | send_lw_4o6_check_hairpinning_udp.py | ${tg_node} | ${args} - -| Send IPv4 UDP and check IPv6 headers for MAP-T -| | [Documentation] -| | ... | Send a UDP in IPv4 and check if IPv4 source and destination \ -| | ... | addresses are correctly translated into IPv6 addresses. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - Node where to run traffic script. Type: string -| | ... | - tx_if - Interface from where to send IPv4 UDP packet. Type: string -| | ... | - rx_if - Interface where to receive IPv6 UDP packet. Type: string -| | ... | - tx_dst_mac - Destination MAC address of IPv4 packet. Type: string -| | ... | - tx_dst_ipv4 - Destination IPv4 address. Type: string -| | ... | - tx_src_ipv4 - Source IPv4 address. Type: string -| | ... | - tx_dst_udp_port - Destination UDP port. Type: integer -| | ... | - rx_dst_mac - Expected destination MAC address. Type: string -| | ... | - rx_src_mac - Expected source MAC address. Type: string -| | ... | - dst_ipv6 - Expected destination IPv6 address. Type: string -| | ... | - src_ipv6 - Expected source IPv6 address. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send IPv4 UDP and check IPv6 headers for MAP-T \ -| | ... | \| ${tg_node} \| port3 \| port3 \| 08:00:27:66:b8:57 \ -| | ... | \| 20.169.201.219 \| 100.0.0.1 \| ${1232} \| 08:00:27:46:2b:4c \ -| | ... | \| 08:00:27:f3:be:f0 \| 2001:db8::14a9:c9db:0 \ -| | ... | \| 2001:db8:ffff::6400:1 \| -| | ... -| | [Arguments] -| | ... | ${tg_node} | ${tx_if} | ${rx_if} -| | ... | ${tx_dst_mac} | ${tx_dst_ipv4} | ${tx_src_ipv4} | ${tx_dst_udp_port} -| | ... | ${rx_dst_mac} | ${rx_src_mac} | ${dst_ipv6} | ${src_ipv6} -| | ... -| | ${tx_name}= | Get interface name | ${tg_node} | ${tx_if} -| | ${rx_name}= | Get interface name | ${tg_node} | ${rx_if} -| | ${args}= | Catenate -| | ... | --tx_if | ${tx_name} | --rx_if | ${rx_name} -| | ... | --tx_dst_mac | ${tx_dst_mac} -| | ... | --tx_src_ipv4 | ${tx_src_ipv4} | --tx_dst_ipv4 | ${tx_dst_ipv4} -| | ... | --tx_dst_udp_port | ${tx_dst_udp_port} -| | ... | --rx_dst_mac | ${rx_dst_mac} | --rx_src_mac | ${rx_src_mac} -| | ... | --rx_src_ipv6 | ${src_ipv6} | --rx_dst_ipv6 | ${dst_ipv6} -| | ... -| | Run Traffic Script On Node -| | ... | send_ipv4_udp_check_map_t.py | ${tg_node} | ${args} - -| Send IPv6 UDP and check IPv4 headers for MAP-T -| | [Documentation] -| | ... | Send a UDP in IPv6 and check if IPv6 source and destination \ -| | ... | addresses are correctly translated into IPv4 addresses. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - Node where to run traffic script. Type: string -| | ... | - tx_if - Interface from where to send IPv4 UDP packet. Type: string -| | ... | - rx_if - Interface where to receive IPv6 UDP packet. Type: string -| | ... | - tx_dst_mac - Destination MAC address of IPv4 packet. Type: string -| | ... | - tx_src_mac - Source MAC address of IPv4 packet. Type: string -| | ... | - tx_dst_ipv6 - Destination IPv6 address. Type: string -| | ... | - tx_src_ipv6 - Source IPv6 address. Type: string -| | ... | - tx_src_udp_port - Source UDP port. Type: integer -| | ... | - rx_dst_mac - Expected destination MAC address. Type: string -| | ... | - rx_src_mac - Expected source MAC address. Type: string -| | ... | - dst_ipv4 - Expected destination IPv4 address. Type: string -| | ... | - src_ipv4 - Expected source IPv4 address. Type: string -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Send IPv6 UDP and check IPv4 headers for MAP-T \ -| | ... | \| port3 \| port4 \| 08:00:27:f3:be:f0 \| 2001:db8:ffff::6400:1 \ -| | ... | \| 2001:db8::14a9:c9db:0 \| ${1232} \| 08:00:27:58:71:eb \ -| | ... | \| 08:00:27:66:b8:57 \| 100.0.0.1 \| 20.169.201.219 \| -| | ... -| | [Arguments] -| | ... | ${tg_node} | ${tx_if} | ${rx_if} | ${tx_dst_mac} | ${tx_src_mac} -| | ... | ${tx_dst_ipv6} | ${tx_src_ipv6} | ${tx_src_udp_port} -| | ... | ${rx_dst_mac} | ${rx_src_mac} | ${dst_ipv4} | ${src_ipv4} -| | ... -| | ${tx_name}= | Get interface name | ${tg_node} | ${tx_if} -| | ${rx_name}= | Get interface name | ${tg_node} | ${rx_if} -| | ${args}= | Catenate -| | ... | --tx_if | ${tx_name} | --rx_if | ${rx_name} -| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_mac | ${tx_src_mac} -| | ... | --tx_src_ipv6 | ${tx_src_ipv6} | --tx_dst_ipv6 | ${tx_dst_ipv6} -| | ... | --tx_src_udp_port | ${tx_src_udp_port} -| | ... | --rx_dst_mac | ${rx_dst_mac} | --rx_src_mac | ${rx_src_mac} -| | ... | --rx_src_ipv4 | ${src_ipv4} | --rx_dst_ipv4 | ${dst_ipv4} -| | ... -| | Run Traffic Script On Node -| | ... | send_ipv6_udp_check_map_t.py | ${tg_node} | ${args} diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 5c8313b360..a9b999058b 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -12,108 +12,18 @@ # limitations under the License. *** Settings *** -| Library | Collections -| Library | String -| Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.DpdkUtil | Library | resources.libraries.python.InterfaceUtil | Library | resources.libraries.python.IPUtil -| Library | resources.libraries.python.L2Util | Library | resources.libraries.python.NodePath -| Library | resources.libraries.python.topology.Topology | Library | resources.libraries.python.TestConfig | Library | resources.libraries.python.TrafficGenerator | Library | resources.libraries.python.TrafficGenerator.TGDropRateSearchImpl | Library | resources.libraries.python.VhostUser | ... -| Resource | resources/libraries/robot/ip/ip4.robot -| Resource | resources/libraries/robot/ip/ip6.robot -| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/l2/l2_patch.robot -| Resource | resources/libraries/robot/l2/l2_xconnect.robot -| Resource | resources/libraries/robot/l2/tagging.robot -| Resource | resources/libraries/robot/overlay/srv6.robot -| Resource | resources/libraries/robot/shared/counters.robot -| Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/shared/interfaces.robot -| ... | Documentation | Performance suite keywords - configuration *** Keywords *** -| Set interfaces in path up -| | [Documentation] -| | ... | *Set UP state on VPP interfaces in path on all DUT nodes and set -| | ... | maximal MTU.* -| | ... -# TODO: Rework KW to set all interfaces in path UP and set MTU (including -# software interfaces. Run KW at the start phase of VPP setup to split -# from other "functional" configuration. This will allow modularity of this -# library -| | :FOR | ${dut} | IN | @{duts} -| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error -| | | ... | Variable Should Exist | ${${dut}_if1} -| | | Run Keyword If | '${if1_status}' == 'PASS' -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up -| | | ... | ELSE -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up -| | | Run Keyword Unless | '${if1_status}' == 'PASS' -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up -| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error -| | | ... | Variable Should Exist | ${${dut}_if2} -| | | Run Keyword If | '${if2_status}' == 'PASS' -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up -| | | ... | ELSE -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_1} | up -| | | Run Keyword Unless | '${if2_status}' == 'PASS' -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_2} | up -| | :FOR | ${dut} | IN | @{duts} -| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error -| | | ... | Variable Should Exist | ${${dut}_if1} -| | | Run Keyword If | '${if1_status}' == 'PASS' -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1} -| | | ... | ELSE -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_1} -| | | Run Keyword Unless | '${if1_status}' == 'PASS' -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2} -| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error -| | | ... | Variable Should Exist | ${${dut}_if2} -| | | Run Keyword If | '${if2_status}' == 'PASS' -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2} -| | | ... | ELSE -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_1} -| | | Run Keyword Unless | '${if2_status}' == 'PASS' -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_2} -| | All VPP Interfaces Ready Wait | ${nodes} | retries=${300} - -| Set single interfaces in path up -| | [Documentation] -| | ... | *Set UP state on single VPP interfaces in path on all DUT nodes and set -| | ... | maximal MTU.* -| | ... -# TODO: Rework KW to set all interfaces in path UP and set MTU (including -# software interfaces. Run KW at the start phase of VPP setup to split -# from other "functional" configuration. This will allow modularity of this -# library -| | :FOR | ${dut} | IN | @{duts} -| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error -| | | ... | Variable Should Exist | ${${dut}_if1} -| | | Run Keyword If | '${if1_status}' == 'PASS' -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up -| | | ... | ELSE -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up -| | | Run Keyword Unless | '${if1_status}' == 'PASS' -| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up -| | :FOR | ${dut} | IN | @{duts} -| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error -| | | ... | Variable Should Exist | ${${dut}_if1} -| | | Run Keyword If | '${if1_status}' == 'PASS' -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1} -| | | ... | ELSE -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_1} -| | | Run Keyword Unless | '${if1_status}' == 'PASS' -| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2} -| | All VPP Interfaces Ready Wait | ${nodes} - | Initialize IPSec in 3-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular @@ -124,18 +34,6 @@ | | ... | address. | | ... | | Set interfaces in path up -| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if1_mac}= | Get Interface MAC | ${dut1} | ${dut1_if1} -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} -| | ${dut2_if2_mac}= | Get Interface MAC | ${dut2} | ${dut2_if2} -| | Set Test Variable | ${tg_if1_mac} -| | Set Test Variable | ${tg_if2_mac} -| | Set Test Variable | ${dut1_if1_mac} -| | Set Test Variable | ${dut1_if2_mac} -| | Set Test Variable | ${dut2_if1_mac} -| | Set Test Variable | ${dut2_if2_mac} | | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | | ... | ${dut1_if1_ip4} | 24 | | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} @@ -198,13 +96,7 @@ | | ... | | ${prefix}= | Set Variable | 64 | | ${host_prefix}= | Set Variable | 64 -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut2} | ${dut2_if1} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2002:1::1 | ${tg1_if1_mac} +| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2002:1::1 | ${tg_if1_mac} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | VPP Add Ip Neighbor | | ... | ${dut1} | ${subif_index_1} | 2002:2::2 | ${dut2_if1_mac} @@ -217,7 +109,7 @@ | | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Set Variable | ${dut2_if2} | | ... | ELSE | Set Variable | ${subif_index_1} -| | VPP Add IP Neighbor | ${dut} | ${dut_if2} | 2002:3::1 | ${tg1_if2_mac} +| | VPP Add IP Neighbor | ${dut} | ${dut_if2} | 2002:3::1 | ${tg_if2_mac} | | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 2002:1::2 | ${prefix} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | VPP Interface Set IP Address | ${dut1} | ${subif_index_1} | 2002:2::1 @@ -246,10 +138,6 @@ | | ... | routing for IPv6 for required number of SIDs and configure IPv6 routes | | ... | on both DUT nodes. | | ... -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | VPP Interface Set IP Address | | ... | ${dut1} | ${dut1_if1} | ${dut1_if1_ip6} | ${prefix} | | VPP Interface Set IP Address @@ -262,9 +150,9 @@ | | :FOR | ${number} | IN RANGE | 2 | ${dst_addr_nr}+2 | | | ${hexa_nr}= | Convert To Hex | ${number} | | | VPP Add IP Neighbor | ${dut1} -| | | ... | ${dut1_if1} | ${tg_if1_ip6_subnet}${hexa_nr} | ${tg1_if1_mac} +| | | ... | ${dut1_if1} | ${tg_if1_ip6_subnet}${hexa_nr} | ${tg_if1_mac} | | | VPP Add IP Neighbor | ${dut2} -| | | ... | ${dut2_if2} | ${tg_if2_ip6_subnet}${hexa_nr} | ${tg1_if2_mac} +| | | ... | ${dut2_if2} | ${tg_if2_ip6_subnet}${hexa_nr} | ${tg_if2_mac} | | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | ${dut2_if1_ip6} | ${dut2_if1_mac} | | VPP Add IP Neighbor @@ -336,10 +224,6 @@ | | ... | KW uses test variable rxq_count_int set by KW Add worker threads | | ... | and rxqueues to all DUTs | | ... -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | ${sock1}= | Set Variable | memif-DUT1_CNF | | ${sock2}= | Set Variable | memif-DUT2_CNF | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock1} @@ -352,7 +236,6 @@ | | ... | ${rxq_count_int} | | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if1} | | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if2} -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Show Memif | ${nodes['${dut}']} | | VPP Interface Set IP Address @@ -377,9 +260,9 @@ | | VPP Add IP Neighbor | | ... | ${dut2} | ${dut2_if1} | ${dut1_if2_ip6} | ${dut1_if2_mac} | | VPP Add IP Neighbor -| | ... | ${dut1} | ${dut1_if1} | ${tg_if1_ip6_subnet}2 | ${tg1_if1_mac} +| | ... | ${dut1} | ${dut1_if1} | ${tg_if1_ip6_subnet}2 | ${tg_if1_mac} | | VPP Add IP Neighbor -| | ... | ${dut2} | ${dut2_if2} | ${tg_if2_ip6_subnet}2 | ${tg1_if2_mac} +| | ... | ${dut2} | ${dut2_if2} | ${tg_if2_ip6_subnet}2 | ${tg_if2_mac} | | ${dut1-memif-1-if2_mac}= | Get Interface MAC | ${dut1} | memif2 | | ${dut2-memif-1-if2_mac}= | Get Interface MAC | ${dut2} | memif2 | | VPP Add IP Neighbor | ${dut1} @@ -448,7 +331,6 @@ | | ... | each DUT. Interfaces are brought up. | | ... | | Set interfaces in path up -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Configure L2patch | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2} @@ -480,8 +362,6 @@ | | Set interfaces in path up | | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 | | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | VPP Add IP Neighbor | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac} | | VPP Add IP Neighbor | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac} | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24 @@ -541,7 +421,6 @@ | | ... | | [Arguments] | ${nf_nodes}=${1} | | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Initialize L2 xconnect with Vhost-User on node | ${dut} | | | ... | nf_nodes=${nf_nodes} @@ -839,18 +718,11 @@ | | ... | | Set interfaces in path up | | ... -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut2} | ${dut2_if1} -| | ... | | :FOR | ${number} | IN RANGE | 2 | ${ip_nr}+2 | | | VPP Add IP Neighbor -| | | ... | ${dut1} | ${dut1_if1} | 10.10.10.${number} | ${tg1_if1_mac} +| | | ... | ${dut1} | ${dut1_if1} | 10.10.10.${number} | ${tg_if1_mac} | | | VPP Add IP Neighbor -| | | ... | ${dut} | ${dut_if2} | 20.20.20.${number} | ${tg1_if2_mac} +| | | ... | ${dut} | ${dut_if2} | 20.20.20.${number} | ${tg_if2_mac} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | 1.1.1.2 | ${dut2_if1_mac} @@ -1103,8 +975,6 @@ | | ... | 24 | | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 172.16.0.2 | | ... | 24 -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | VPP Add IP Neighbor | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac} | | VPP Add IP Neighbor | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac} | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24 @@ -1256,8 +1126,6 @@ | | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | ${vxlan.vni} | | | ... | ${dut2_address} | ${vxlan.vtep} | | | Add interface to bridge domain | ${dut2} | ${dut2s_vxlan} | ${dut2_bd_id1} -| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | ${dut1_gw} | ${tg_if1_mac} | | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | ${dut2_gw} | ${tg_if2_mac} | | Vpp Route Add | ${dut1} | ${dut1_route_subnet} | ${dut1_route_mask} @@ -1479,16 +1347,12 @@ | | ... | ${dut2_dut1_address} | ${dut2_tg_address} | ${duts_prefix} | | ... | | Set interfaces in path up -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac} +| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg_if1_mac} | | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | ${dut2_dut1_address} | ${dut2_if1_mac} | | VPP Add IP Neighbor | | ... | ${dut2} | ${dut2_if1} | ${dut1_dut2_address} | ${dut1_if2_mac} -| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac} +| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg_if2_mac} | | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | | ... | ${dut1_tg_address} | ${duts_prefix} | | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} @@ -1555,10 +1419,6 @@ | | ... | ${dut2_dut1_address} | ${dut2_tg_address} | ${prefix} | | ... | | Set interfaces in path up -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | VPP Interface Set IP Address | | ... | ${dut1} | ${dut1_if1} | ${dut1_tg_address} | ${prefix} | | VPP Interface Set IP Address @@ -1568,8 +1428,8 @@ | | VPP Interface Set IP Address | | ... | ${dut2} | ${dut2_if2} | ${dut2_tg_address} | ${prefix} | | Vpp All Ra Suppress Link Layer | ${nodes} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} -| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} +| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg_if1_mac} +| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg_if2_mac} | | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | ${dut2_dut1_address} | ${dut2_if1_mac} | | VPP Add IP Neighbor @@ -1603,10 +1463,6 @@ | | ... | ${prefix4} | ${prefix6} | | ... | | Set interfaces in path up -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | | ... | ${dut1_tg_ip4_address} | ${prefix4} | | VPP Interface Set IP Address @@ -1616,8 +1472,8 @@ | | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} | | ... | ${dut2_tg_ip4_address} | ${prefix4} | | Vpp All Ra Suppress Link Layer | ${nodes} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac} -| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac} +| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg_if1_mac} +| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg_if2_mac} | | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip6_address} | ${dut2_if1_mac} | | VPP Add IP Neighbor @@ -1651,10 +1507,6 @@ | | ... | ${prefix6} | ${prefix4} | | ... | | Set interfaces in path up -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | VPP Interface Set IP Address | | ... | ${dut1} | ${dut1_if1} | ${dut1_tg_ip6_address} | ${prefix6} | | VPP Interface Set IP Address @@ -1664,8 +1516,8 @@ | | VPP Interface Set IP Address | | ... | ${dut2} | ${dut2_if2} | ${dut2_tg_ip6_address} | ${prefix6} | | Vpp All Ra Suppress Link Layer | ${nodes} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} -| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} +| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg_if1_mac} +| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg_if2_mac} | | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip4_address} | ${dut2_if1_mac} | | VPP Add IP Neighbor @@ -1700,13 +1552,6 @@ | | ... | ELSE | Set Variable | ${dut1_if2} | | VPP Interface Set IP Address | ${dut} | ${dut_if2} | 12.0.0.1 | 20 | | ... -| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut2} | ${dut2_if1} -| | ... | | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.0.0.2 | ${tg_if1_mac} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | VPP Add IP Neighbor @@ -1786,7 +1631,6 @@ | | ... | | [Arguments] | ${count}=${1} | | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Initialize L2 xconnect with memif pairs on DUT node | ${dut} | ${count} | | Set interfaces in path up @@ -1856,7 +1700,6 @@ | | ... | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} | | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Initialize L2 Bridge Domain with memif pairs on DUT node | ${dut} | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} @@ -1911,7 +1754,6 @@ | | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} | | ... | Set Variable | ${rxq_count_int} | | ... | ELSE | Set Variable | ${1} -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} | ${1} | | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if2} | ${2} @@ -2058,7 +1900,6 @@ | | ... | | [Arguments] | ${number}=${1} | | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${sock}= | Set Variable | memif-${dut}_CNF | | | ${sid}= | Evaluate | (${number} * ${2}) - ${1} @@ -2092,7 +1933,6 @@ | | ... | | [Arguments] | ${number}=${1} | | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${sock}= | Set Variable | memif-${dut}_CNF | | | ${sid}= | Evaluate | (${number} * ${2}) - ${1} diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index f29a26e59a..13370bc6db 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -39,9 +39,18 @@ | Resource | resources/libraries/robot/crypto/ipsec.robot | Resource | resources/libraries/robot/features/gbp.robot | Resource | resources/libraries/robot/features/policer.robot +| Resource | resources/libraries/robot/ip/ip4.robot +| Resource | resources/libraries/robot/ip/ip6.robot +| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot +| Resource | resources/libraries/robot/l2/l2_patch.robot +| Resource | resources/libraries/robot/l2/l2_xconnect.robot +| Resource | resources/libraries/robot/l2/tagging.robot +| Resource | resources/libraries/robot/overlay/srv6.robot | Resource | resources/libraries/robot/performance/performance_configuration.robot | Resource | resources/libraries/robot/performance/performance_limits.robot | Resource | resources/libraries/robot/performance/performance_utils.robot +| Resource | resources/libraries/robot/shared/counters.robot +| Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/container.robot | Resource | resources/libraries/robot/shared/suite_teardown.robot | Resource | resources/libraries/robot/shared/suite_setup.robot diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index 37eb73991c..ae2aa7b9a8 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -13,25 +13,81 @@ *** Settings *** | Library | resources.libraries.python.InterfaceUtil | Library | resources.libraries.python.NodePath -| Library | resources.libraries.python.VatExecutor *** Keywords *** -| VPP reports interfaces through VAT on '${node}' -| | Execute Script | dump_interfaces.vat | ${node} -| | Script Should Have Passed +| Set interfaces in path up +| | [Documentation] +| | ... | *Set UP state on VPP interfaces in path on all DUT nodes and set +| | ... | maximal MTU.* +| | ... +# TODO: Rework KW to set all interfaces in path UP and set MTU (including +# software interfaces. Run KW at the start phase of VPP setup to split +# from other "functional" configuration. This will allow modularity of this +# library +| | :FOR | ${dut} | IN | @{duts} +| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if1} +| | | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up +| | | ... | ELSE +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up +| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if2} +| | | Run Keyword If | '${if2_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up +| | | ... | ELSE +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_1} | up +| | | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_2} | up +| | :FOR | ${dut} | IN | @{duts} +| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if1} +| | | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1} +| | | ... | ELSE +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_1} +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2} +| | | ${if2_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if2} +| | | Run Keyword If | '${if2_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2} +| | | ... | ELSE +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_1} +| | | Run Keyword Unless | '${if2_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2_2} +| | All VPP Interfaces Ready Wait | ${nodes} | retries=${300} -| Configure MTU on TG based on MTU on DUT -| | [Documentation] | Type of the tg_node must be TG and dut_node must be DUT -| | [Arguments] | ${tg_node} | ${dut_node} -| | Append Nodes | ${tg_node} | ${dut_node} -| | Compute Path -| | ${tg_port} | ${tg_node}= | First Interface -| | ${dut_port} | ${dut_node}= | Last Interface -| | # get physical layer MTU (max. size of Ethernet frame) -| | ${mtu}= | Get Interface MTU | ${dut_node} | ${dut_port} -| | # Ethernet MTU is physical layer MTU minus size of Ethernet header and FCS -| | ${eth_mtu}= | Evaluate | ${mtu} - 14 - 4 -| | Set Interface Ethernet MTU | ${tg_node} | ${tg_port} | ${eth_mtu} +| Set single interfaces in path up +| | [Documentation] +| | ... | *Set UP state on single VPP interfaces in path on all DUT nodes and set +| | ... | maximal MTU.* +| | ... +# TODO: Rework KW to set all interfaces in path UP and set MTU (including +# software interfaces. Run KW at the start phase of VPP setup to split +# from other "functional" configuration. This will allow modularity of this +# library +| | :FOR | ${dut} | IN | @{duts} +| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if1} +| | | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up +| | | ... | ELSE +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up +| | :FOR | ${dut} | IN | @{duts} +| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error +| | | ... | Variable Should Exist | ${${dut}_if1} +| | | Run Keyword If | '${if1_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1} +| | | ... | ELSE +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_1} +| | | Run Keyword Unless | '${if1_status}' == 'PASS' +| | | ... | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1_2} +| | All VPP Interfaces Ready Wait | ${nodes} | Get Vhost dump | | [Documentation] | Get vhost-user dump. -- 2.16.6