From d9716ad55cf9d1ec63d4297c9b61134a62d5be64 Mon Sep 17 00:00:00 2001 From: selias Date: Wed, 29 Jun 2016 10:38:31 +0200 Subject: Rename Honeycomb test suites - update test suite numbering to be future-proof - reorder suite execution: - persistence suite should always run last - l2_fib suite follows after l2 - VxLAN gpe suite follows after VxLAN - fix issue with interface name vs. index introduced in change #1032 - change ${node} variable to global scope, set in _init_.robot Change-Id: Ib4ca7265586026faab219da9923e7ca312ef2c79 Signed-off-by: selias --- resources/libraries/robot/honeycomb/bridge_domain.robot | 8 +++++--- resources/libraries/robot/honeycomb/interfaces.robot | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'resources') diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot index 76122fa8f9..f8951e6ff1 100644 --- a/resources/libraries/robot/honeycomb/bridge_domain.robot +++ b/resources/libraries/robot/honeycomb/bridge_domain.robot @@ -212,9 +212,11 @@ | | ... | \| GigabitEthernet0/9/0 \| ${{split_horizon_group:2, bvi:False}} \| | | [Arguments] | ${node} | ${index} | ${interface1} | ${interface2} | | ... | ${settings} -| | ${if1_index}= | Get interface sw index | ${node} | ${interface1} -| | ${if2_index}= | Get interface sw index | ${node} | ${interface2} -| | ${if_indices}= | Create list | ${if1_index} | ${if2_index} +| | ${if1_link}= | Get interface by name | ${node} | ${interface1} +| | ${if2_link}= | Get interface by name | ${node} | ${interface2} +| | ${if_indices}= | Create list +| | ... | ${node['interfaces']['${if1_link}']['vpp_sw_index']} +| | ... | ${node['interfaces']['${if2_link}']['vpp_sw_index']} | | ${bd_data}= | VPP get bridge domain data | ${node} | | ${bd_interfaces}= | Set Variable | ${bd_data[${index}]['sw_if']} | | @{bd_interfaces}= | Create List | ${bd_interfaces[0]} | ${bd_interfaces[1]} diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot index ea1d2b090b..8321342d70 100644 --- a/resources/libraries/robot/honeycomb/interfaces.robot +++ b/resources/libraries/robot/honeycomb/interfaces.robot @@ -33,6 +33,7 @@ | | ... | \| up \| | | [Arguments] | ${node} | ${interface} | ${state} | | interfaceCLI.Set interface state | ${node} | ${interface} | ${state} +| | ... | if_type=name | Honeycomb sets interface state | | [Documentation] | Uses Honeycomb API to change the admin state\ @@ -184,9 +185,9 @@ | | Should be equal | ${prefix} | | ... | ${api_data['ietf-ip:ipv4']['address'][0]['prefix-length']} | | Should be equal | ${fib_address} -| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip'] +| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip']} | | Should be equal | ${fib_mac} -| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['link-layer-address'] +| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['link-layer-address']} | | :FOR | ${key} | IN | @{settings.keys()} | | | Should be equal | | | ... | ${settings['{key']} | ${api_data['ietf-ip:ipv4']['{$key}']} -- cgit 1.2.3-korg