diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/bridge_domain.robot | 6 | ||||
| -rw-r--r-- | resources/libraries/robot/dhcp_client.robot | 9 | ||||
| -rw-r--r-- | resources/libraries/robot/double_qemu_setup.robot | 8 | ||||
| -rw-r--r-- | resources/libraries/robot/gre.robot | 8 | ||||
| -rw-r--r-- | resources/libraries/robot/ipv4.robot | 18 | ||||
| -rw-r--r-- | resources/libraries/robot/ipv6.robot | 24 | ||||
| -rw-r--r-- | resources/libraries/robot/l2_traffic.robot | 8 | ||||
| -rw-r--r-- | resources/libraries/robot/traffic.robot | 27 | ||||
| -rw-r--r-- | resources/libraries/robot/vxlan.robot | 19 |
9 files changed, 85 insertions, 42 deletions
diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot index 96af11d2da..ac0fea8bd4 100644 --- a/resources/libraries/robot/bridge_domain.robot +++ b/resources/libraries/robot/bridge_domain.robot @@ -227,9 +227,9 @@ | | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} | | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} | | Linux Add Bridge | ${vm} | ${br} | ${vhost1} | ${vhost2} -| | Set Interface State | ${vm} | ${vhost1} | up -| | Set Interface State | ${vm} | ${vhost2} | up -| | Set Interface State | ${vm} | ${br} | up +| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name +| | Set Interface State | ${vm} | ${br} | up | if_type=name | | Set Test Variable | ${vm_node} | ${vm} | VPP Vhost interfaces for L2BD forwarding are setup diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/dhcp_client.robot index 0dd5e7bbe6..c3c4645d3d 100644 --- a/resources/libraries/robot/dhcp_client.robot +++ b/resources/libraries/robot/dhcp_client.robot @@ -42,7 +42,8 @@ | | ... | \| eth2 \| 08:00:27:66:b8:57 \| client-hostname \| | | ... | | [Arguments] | ${tg_node} | ${interface} | ${src_mac} | ${hostname}=${EMPTY} -| | ${args}= | Catenate | --rx_if | ${interface} | --rx_src_mac | ${src_mac} +| | ${interface_name}= | Get interface name | ${tg_node} | ${interface} +| | ${args}= | Catenate | --rx_if | ${interface_name} | --rx_src_mac | ${src_mac} | | ${args}= | Run Keyword If | "${hostname}" == "" | Set Variable | ${args} | | ... | ELSE | Catenate | ${args} | --hostname | ${hostname} | | Run Traffic Script On Node | dhcp/check_dhcp_discover.py @@ -92,7 +93,8 @@ | | [Arguments] | ${tg_node} | ${tg_interface} | ${server_mac} | ${server_ip} | | ... | ${client_mac} | ${client_ip} | ${client_mask} | | ... | ${hostname}=${EMPTY} | ${offer_xid}=${EMPTY} -| | ${args}= | Catenate | --rx_if | ${tg_interface} | --server_mac +| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface} +| | ${args}= | Catenate | --rx_if | ${tg_interface_name} | --server_mac | | ... | ${server_mac} | --server_ip | ${server_ip} | --client_mac | | ... | ${client_mac} | --client_ip | ${client_ip} | --client_mask | | ... | ${client_mask} @@ -130,7 +132,8 @@ | | [Arguments] | ${tg_node} | ${tg_interface} | | ... | ${server_mac} | ${server_ip} | ${client_ip} | ${client_mask} | | ... | ${lease_time} -| | ${args}= | Catenate | --rx_if | ${tg_interface} +| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface} +| | ${args}= | Catenate | --rx_if | ${tg_interface_name} | | ... | --server_mac | ${server_mac} | --server_ip | ${server_ip} | | ... | --client_ip | ${client_ip} | --client_mask | ${client_mask} | | ... | --lease_time | ${lease_time} diff --git a/resources/libraries/robot/double_qemu_setup.robot b/resources/libraries/robot/double_qemu_setup.robot index 167605e943..d2d7e9eae1 100644 --- a/resources/libraries/robot/double_qemu_setup.robot +++ b/resources/libraries/robot/double_qemu_setup.robot @@ -56,10 +56,10 @@ | | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} | | ${vhost3}= | Get Vhost User If Name By Sock | ${vm} | ${sock3} | | ${vhost4}= | Get Vhost User If Name By Sock | ${vm} | ${sock4} -| | Set Interface State | ${vm} | ${vhost1} | up -| | Set Interface State | ${vm} | ${vhost2} | up -| | Set Interface State | ${vm} | ${vhost3} | up -| | Set Interface State | ${vm} | ${vhost4} | up +| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost3} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost4} | up | if_type=name | | Setup Network Namespace | | ... | ${vm} | nmspace1 | ${vhost1} | ${ip1} | ${prefix_length} | | Setup Network Namespace diff --git a/resources/libraries/robot/gre.robot b/resources/libraries/robot/gre.robot index b2036b840d..23d6ff9098 100644 --- a/resources/libraries/robot/gre.robot +++ b/resources/libraries/robot/gre.robot @@ -75,7 +75,9 @@ | | ... | ${tx_dst_mac} | ${rx_dst_mac} | | ... | ${inner_src_ip} | ${inner_dst_ip} | | ... | ${outer_src_ip} | ${outer_dst_ip} -| | ${args}= | Catenate | --tx_if | ${tx_if} | --rx_if | ${rx_if} +| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if} +| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if} +| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name} | | | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac} | | | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip} | | | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip} @@ -115,7 +117,9 @@ | | ... | ${tx_dst_mac} | ${rx_dst_mac} | | ... | ${inner_src_ip} | ${inner_dst_ip} | | ... | ${outer_src_ip} | ${outer_dst_ip} -| | ${args}= | Catenate | --tx_if | ${tx_if} | --rx_if | ${rx_if} +| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if} +| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if} +| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name} | | | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac} | | | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip} | | | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip} diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot index 4464cbc53c..7db329d97f 100644 --- a/resources/libraries/robot/ipv4.robot +++ b/resources/libraries/robot/ipv4.robot @@ -28,7 +28,7 @@ | | [Arguments] | ${nodes} | ${nodes_addr} | | ${interfaces}= | VPP nodes set ipv4 addresses | ${nodes} | ${nodes_addr} | | :FOR | ${interface} | IN | @{interfaces} -| | | Set Interface State | @{interface} | up +| | | Set Interface State | @{interface} | up | if_type=name | Routes are set up for IPv4 testing | | [Documentation] | Setup routing on all VPP nodes required for IPv4 tests @@ -67,9 +67,12 @@ | | ${dst_mac}= | Get interface mac | ${to_node} | ${to_port} | | ${is_dst_tg}= | Is TG node | ${to_node} | | ${adj_node} | ${adj_int}= | Get adjacent node and interface | ${nodes} | ${from_node} | ${from_port} -| | ${args}= | Traffic Script Gen Arg | ${to_port} | ${from_port} | ${src_mac} +| | ${from_port_name}= | Get interface name | ${from_node} | ${from_port} +| | ${to_port_name}= | Get interface name | ${to_node} | ${to_port} +| | ${adj_int_mac}= | Get interface MAC | ${adj_node} | ${adj_int} +| | ${args}= | Traffic Script Gen Arg | ${to_port_name} | ${from_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} -| | ${args}= | Catenate | ${args} | --hops ${hops} | --first_hop_mac ${adj_int['mac_address']} +| | ${args}= | Catenate | ${args} | --hops ${hops} | --first_hop_mac ${adj_int_mac} | | | ... | --is_dst_tg ${is_dst_tg} | | Run Traffic Script On Node | ipv4_ping_ttl_check.py | ${from_node} | ${args} @@ -84,7 +87,8 @@ | | ${dst_ip}= | Get IPv4 address of node "${dst_node}" interface "${dst_port}" from "${nodes_ipv4_addr}" | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port} | | ${dst_mac}= | Get Interface Mac | ${dst_node} | ${dst_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${src_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | ${args}= | Set Variable | | ... | ${args} --start_size ${start_size} --end_size ${end_size} --step ${step} @@ -99,7 +103,8 @@ | | ${dst_ip}= | Get IPv4 address of node "${vpp_node}" interface "${dst_if}" from "${nodes_ipv4_addr}" | | ${src_mac}= | Get node link mac | ${tg_node} | ${link_name} | | ${dst_mac}= | Get node link mac | ${vpp_node} | ${link_name} -| | ${args}= | Traffic Script Gen Arg | ${src_if} | ${src_if} | ${src_mac} +| | ${src_if_name}= | Get interface name | ${tg_node} | ${src_if} +| | ${args}= | Traffic Script Gen Arg | ${src_if_name} | ${src_if_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args} @@ -149,7 +154,8 @@ | | ... | | [Arguments] | ${tg_node} | ${tg_interface} | | ... | ${dst_mac} | ${src_mac} | ${dst_ip} | ${src_ip} | ${timeout}=${10} -| | ${args}= | Catenate | --rx_if | ${tg_interface} | --tx_if | ${tg_interface} +| | ${tg_interface_name}= | Get interface name | ${tg_node} | ${tg_interface} +| | ${args}= | Catenate | --rx_if | ${tg_interface_name} | --tx_if | ${tg_interface_name} | | ... | --dst_mac | ${dst_mac} | --src_mac | ${src_mac} | | ... | --dst_ip | ${dst_ip} | --src_ip | ${src_ip} | --timeout | ${timeout} | | Run Traffic Script On Node | send_icmp_wait_for_reply.py diff --git a/resources/libraries/robot/ipv6.robot b/resources/libraries/robot/ipv6.robot index ef0b79f657..19c222e7c2 100644 --- a/resources/libraries/robot/ipv6.robot +++ b/resources/libraries/robot/ipv6.robot @@ -37,7 +37,8 @@ | | ${dst_ip}= | Get Node Port Ipv6 Address | ${dst_node} | ${dst_port} | ${nodes_addr} | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port} | | ${dst_mac}= | Get Interface Mac | ${dst_node} | ${dst_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${src_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args} | | Vpp dump stats | ${dst_node} @@ -56,7 +57,8 @@ | | ${dst_ip}= | Get Node Port Ipv6 Address | ${dst_node} | ${dst_port} | ${nodes_addr} | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port} | | ${dst_mac}= | Get Interface Mac | ${dst_node} | ${dst_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${src_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | ${args}= | Set Variable | | ... | ${args} --start_size ${start_size} --end_size ${end_size} --step ${step} @@ -74,7 +76,8 @@ | | ${dst_ip}= | Get Node Port Ipv6 Address | ${dst_node} | ${dst_port} | ${nodes_addr} | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port} | | ${dst_mac}= | Get Interface Mac | ${hop_node} | ${hop_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${src_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args} @@ -91,7 +94,8 @@ | | ${dst_ip}= | Get Node Port Ipv6 Address | ${dst_node} | ${dst_port} | ${nodes_addr} | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port} | | ${dst_mac}= | Get Interface Mac | ${hop_node} | ${hop_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${src_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args} @@ -107,7 +111,8 @@ | | ${dst_ip}= | Get Node Port Ipv6 Address | ${dst_node} | ${dst_port} | ${nodes_addr} | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port} | | ${dst_mac}= | Get Interface Mac | ${hop_node} | ${hop_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${src_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args} @@ -127,7 +132,9 @@ | | ${dst_mac}= | Get Interface Mac | ${src_node} | ${dst_port} | | ${src_nh_mac}= | Get Interface Mac | ${src_nh_node} | ${src_nh_port} | | ${dst_nh_mac}= | Get Interface Mac | ${dst_nh_node} | ${dst_nh_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${dst_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${dst_port_name}= | Get interface name | ${dst_node} | ${dst_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${dst_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | ${args}= | Catenate | ${args} | --src_nh_mac ${src_nh_mac} | | | ... | --dst_nh_mac ${dst_nh_mac} | --h_num 2 @@ -144,7 +151,8 @@ | | ${dst_ip}= | Get Node Port Ipv6 Address | ${dst_node} | ${dst_port} | ${nodes_addr} | | ${src_mac}= | Get Interface Mac | ${src_node} | ${src_port} | | ${dst_mac}= | Get Interface Mac | ${dst_node} | ${dst_port} -| | ${args}= | Traffic Script Gen Arg | ${src_port} | ${src_port} | ${src_mac} +| | ${src_port_name}= | Get interface name | ${src_node} | ${src_port} +| | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | ipv6_ns.py | ${src_node} | ${args} @@ -154,7 +162,7 @@ | | Setup all DUTs before test | | ${interfaces}= | Nodes Set Ipv6 Addresses | ${nodes} | ${nodes_addr} | | :FOR | ${interface} | IN | @{interfaces} -| | | Set Interface State | @{interface} | up +| | | Set Interface State | @{interface} | up | if_type=name | | All Vpp Interfaces Ready Wait | ${nodes} | Clear ipv6 on all dut in topology diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot index 1ddb6024fb..d8e24b8420 100644 --- a/resources/libraries/robot/l2_traffic.robot +++ b/resources/libraries/robot/l2_traffic.robot @@ -44,7 +44,9 @@ | | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2 | | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int} | | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int} -| | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac} +| | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int} +| | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int} +| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args} @@ -76,7 +78,9 @@ | | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2 | | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int} | | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int} -| | ${args}= | Traffic Script Gen Arg | ${dst_int} | ${src_int} | ${src_mac} +| | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int} +| | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int} +| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Keyword And Expect Error | ICMP echo Rx timeout | | | ... | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args} diff --git a/resources/libraries/robot/traffic.robot b/resources/libraries/robot/traffic.robot index 29635c0a34..90f7ab2805 100644 --- a/resources/libraries/robot/traffic.robot +++ b/resources/libraries/robot/traffic.robot @@ -59,10 +59,12 @@ | | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_src_port} | | | ... | ${tx_src_mac} | ${tx_dst_mac} | ${rx_port} | ${rx_src_mac} | | ... | ${rx_dst_mac} +| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_src_port} +| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port} | | ${args}= | Catenate | --tg_src_mac | ${tx_src_mac} | --tg_dst_mac | | | ... | ${rx_dst_mac} | --dut_if1_mac | ${tx_dst_mac} | --dut_if2_mac | | | ... | ${rx_src_mac} | --src_ip | ${src_ip} | --dst_ip | ${dst_ip} | -| | ... | --tx_if | ${tx_src_port} | --rx_if | ${rx_port} +| | ... | --tx_if | ${tx_port_name} | --rx_if | ${rx_port_name} | | Run Traffic Script On Node | send_icmp_check_headers.py | ${tg_node} | | | ... | ${args} @@ -98,10 +100,12 @@ | | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_src_port} | | | ... | ${tx_src_mac} | ${tx_dst_mac} | ${rx_port} | ${rx_src_mac} | | | ... | ${rx_dst_mac} +| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_src_port} +| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port} | | ${args}= | Catenate | --tg_src_mac | ${tx_src_mac} | --tg_dst_mac | | | ... | ${rx_dst_mac} | --dut_if1_mac | ${tx_dst_mac} | --dut_if2_mac | | | ... | ${rx_src_mac} | --src_ip | ${src_ip} | --dst_ip | ${dst_ip} | -| | ... | --tx_if | ${tx_src_port} | --rx_if | ${rx_port} +| | ... | --tx_if | ${tx_port_name} | --rx_if | ${rx_port_name} | | Run Keyword And Expect Error | ICMP echo Rx timeout | | | ... | Run Traffic Script On Node | send_icmp_check_headers.py | | ... | ${tg_node} | ${args} @@ -144,10 +148,12 @@ | | [Arguments] | ${tg_node} | ${tx_src_ip} | ${tx_dst_ip} | ${tx_port} | | ... | ${tx_dst_mac} | ${rx_port} | ${rx_src_mac} | ${rx_arp_src_ip} | | ... | ${rx_arp_dst_ip} +| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_port} +| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port} | | ${args}= | Catenate | | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_src_mac | ${rx_src_mac} | | ... | --tx_src_ip | ${tx_src_ip} | --tx_dst_ip | ${tx_dst_ip} -| | ... | --tx_if | ${tx_port} | --rx_if | ${rx_port} +| | ... | --tx_if | ${tx_port_name} | --rx_if | ${rx_port_name} | | ... | --rx_arp_src_ip ${rx_arp_src_ip} | --rx_arp_dst_ip ${rx_arp_dst_ip} | | Run Traffic Script On Node | send_icmp_check_arp.py | ${tg_node} | ${args} @@ -183,12 +189,14 @@ | | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_port} | | | ... | ${tx_mac} | ${rx_port} | ${rx_mac} | ${protocol} | ${source_port} | | ... | ${destination_port} +| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_port} +| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port} | | ${args}= | Catenate | --tx_mac | ${tx_mac} | | ... | --rx_mac | ${rx_mac} | | ... | --src_ip | ${src_ip} | | ... | --dst_ip | ${dst_ip} -| | ... | --tx_if | ${tx_port} -| | ... | --rx_if | ${rx_port} +| | ... | --tx_if | ${tx_port_name} +| | ... | --rx_if | ${rx_port_name} | | ... | --protocol | ${protocol} | | ... | --source_port | ${source_port} | | ... | --destination_port | ${destination_port} @@ -227,12 +235,14 @@ | | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_port} | | | ... | ${tx_mac} | ${rx_port} | ${rx_mac} | ${protocol} | ${source_port} | | ... | ${destination_port} +| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_port} +| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port} | | ${args}= | Catenate | --tx_mac | ${tx_mac} | | ... | --rx_mac | ${rx_mac} | | ... | --src_ip | ${src_ip} | | ... | --dst_ip | ${dst_ip} -| | ... | --tx_if | ${tx_port} -| | ... | --rx_if | ${rx_port} +| | ... | --tx_if | ${tx_port_name} +| | ... | --rx_if | ${rx_port_name} | | ... | --protocol | ${protocol} | | ... | --source_port | ${source_port} | | ... | --destination_port | ${destination_port} @@ -260,5 +270,6 @@ | | ... | \| ${nodes['DUT1']} \| eth2 \| 08:00:27:cc:4f:54 \| | | ... | | [Arguments] | ${node} | ${rx_port} | ${src_mac} -| | ${args}= | Catenate | --rx_if | ${rx_port} | --src_mac | ${src_mac} +| | ${rx_port_name}= | Get interface name | ${node} | ${rx_port} +| | ${args}= | Catenate | --rx_if | ${rx_port_name} | --src_mac | ${src_mac} | | Run Traffic Script On Node | check_ra_packet.py | ${node} | ${args} diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot index 7b9776948e..f6506bb3db 100644 --- a/resources/libraries/robot/vxlan.robot +++ b/resources/libraries/robot/vxlan.robot @@ -27,6 +27,7 @@ | IP addresses are set on interfaces | | [Documentation] | *Set IPv4 addresses on interfaces on DUTs.* | | ... | If interface index is None then is determines with Get Interface Sw Index +| | ... | in this case it is required the interface to be present in topology dict. | | ... | It also executes VPP IP Probe to determine MACs to IPs on DUTs | | ... | | ... | _Set testcase variables with IP addresses and prefix length:_ @@ -39,18 +40,22 @@ | | Set Test Variable | ${dut1s_ip_address} | 172.16.0.1 | | Set Test Variable | ${dut2s_ip_address} | 172.16.0.2 | | Set Test Variable | ${duts_ip_address_prefix} | 24 +| | ${DUT1_INT_KEY}= | Run Keyword If | ${DUT1_INT_INDEX} is None +| | | ... | Get Interface by name | ${DUT1} | ${DUT1_INT_NAME} +| | ${DUT2_INT_KEY}= | Run Keyword If | ${DUT2_INT_INDEX} is None +| | | ... | Get Interface by name | ${DUT2} | ${DUT2_INT_NAME} | | ${DUT1_INT_INDEX}= | Run Keyword If | ${DUT1_INT_INDEX} is None -| | | ... | Get Interface Sw Index | ${DUT1} | ${DUT1_INT_NAME} +| | | ... | Get Interface Sw Index | ${DUT1} | ${DUT1_INT_KEY} | | | ... | ELSE | Set Variable | ${DUT1_INT_INDEX} | | ${DUT2_INT_INDEX}= | Run Keyword If | ${DUT2_INT_INDEX} is None -| | | ... | Get Interface Sw Index | ${DUT2} | ${DUT2_INT_NAME} +| | | ... | Get Interface Sw Index | ${DUT2} | ${DUT2_INT_KEY} | | | ... | ELSE | Set Variable | ${DUT2_INT_INDEX} | | Set Interface Address | ${DUT1} | ${DUT1_INT_INDEX} | | ... | ${dut1s_ip_address} | ${duts_ip_address_prefix} | | Set Interface Address | ${DUT2} | ${DUT2_INT_INDEX} | | ... | ${dut2s_ip_address} | ${duts_ip_address_prefix} -| | VPP IP Probe | ${DUT1} | ${DUT1_INT_NAME} | ${dut2s_ip_address} -| | VPP IP Probe | ${DUT2} | ${DUT2_INT_NAME} | ${dut1s_ip_address} +| | VPP IP Probe | ${DUT1} | ${DUT1_INT_NAME} | ${dut2s_ip_address} | if_type=name +| | VPP IP Probe | ${DUT2} | ${DUT2_INT_NAME} | ${dut1s_ip_address} | if_type=name | VXLAN interface is created | | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} @@ -74,10 +79,12 @@ | | ... | - ${dut2s_vlan_index} | | ... | | [Arguments] | ${VLAN} | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} +| | ${INT1_NAME}= | Get interface name | ${DUT1} | ${INT1} +| | ${INT2_NAME}= | Get interface name | ${DUT2} | ${INT2} | | ${dut1s_vlan_name} | ${dut1s_vlan_index}= | Create Vlan Subinterface -| | | ... | ${DUT1} | ${INT1} | ${VLAN} +| | | ... | ${DUT1} | ${INT1_NAME} | ${VLAN} | | ${dut2s_vlan_name} | ${dut2s_vlan_index}= | Create Vlan Subinterface -| | | ... | ${DUT2} | ${INT2} | ${VLAN} +| | | ... | ${DUT2} | ${INT2_NAME} | ${VLAN} | | Set Interface State | ${DUT1} | ${dut1s_vlan_index} | up | | Set Interface State | ${DUT2} | ${dut2s_vlan_index} | up | | Set Test Variable | ${dut1s_vlan_name} |