diff options
| author |   Miroslav Miklus <mmiklus@cisco.com> | 2016-05-08 14:11:51 +0200 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2016-06-28 00:15:03 +0000 |
| commit | cbd47fbe97945e9dc6584d08cd2266e3a7536a68 (patch) | |
| tree | 9344a863606381b2ce8069d82f0731440c31b295 /resources/libraries/robot/ipv4.robot | |
| parent | 1689b0781206d874fd2b664cdd7d770f1e3932c8 (diff) | |
Use interface key instead of interface name.
JIRA: CSIT-141
Change-Id: I75cef6d570ab45ea9c4af838b6bf68cefc7c1a91
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
Diffstat (limited to 'resources/libraries/robot/ipv4.robot')
| -rw-r--r-- | resources/libraries/robot/ipv4.robot | 18 |
1 files changed, 12 insertions, 6 deletions
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 |