diff options
Diffstat (limited to 'resources/libraries/robot')
4 files changed, 22 insertions, 20 deletions
diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot index e26c18d019..44dd450944 100644 --- a/resources/libraries/robot/honeycomb/bridge_domain.robot +++ b/resources/libraries/robot/honeycomb/bridge_domain.robot @@ -144,7 +144,7 @@ | | ... | ${if2_data['v3po:l2']['bridged-virtual-interface']} | | ... | ${settings['bvi']} -| VAT should show interfaces assigned to bridge domain +| PAPI should show interfaces assigned to bridge domain | | [Documentation] | Uses VAT to verify interface assignment to\ | | ... | bridge domain. | | ... @@ -159,7 +159,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| VAT should show interfaces assigned to bridge domain \ +| | ... | \| PAPI should show interfaces assigned to bridge domain \ | | ... | \| ${nodes['DUT1']} \| ${4} \| GigabitEthernet0/8/0 \ | | ... | \| GigabitEthernet0/9/0 \| ${{split_horizon_group:2, bvi:False}} \| | | [Arguments] | ${node} | ${index} | ${interface1} | ${interface2} @@ -170,11 +170,12 @@ | | ... | ${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}= | Set Variable | ${bd_data[${index}]['sw_if_details']} | | @{bd_interfaces}= | Create List | ${bd_interfaces[0]} | ${bd_interfaces[1]} | | :FOR | ${interface} | IN | @{bd_interfaces} -| | | Should contain | ${if_indices} | ${interface['sw_if_index']} -| | | Should be equal | ${interface['shg']} | ${settings['split_horizon_group']} +# interface[1] = sw_if_index, interface[2] = shg +| | | Should contain | ${if_indices} | ${interface[1]} +| | | Should be equal | ${interface[2]} | ${settings['split_horizon_group']} | Honeycomb removes all bridge domains | | [Documentation] | Uses Honeycomb API to remove all bridge domains from the \ @@ -205,7 +206,7 @@ | | Run keyword and expect error | *Not possible*Status code: 404* | | ... | Get all BDs oper data | ${node} -| VAT should show no bridge domains +| PAPI should show no bridge domains | | [Documentation] | Uses VAT to verify the removal of all bridge domains. | | ... | | ... | *Arguments:* @@ -213,10 +214,10 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| VAT should show no bridge domains \| ${nodes['DUT1']} \| +| | ... | \| PAPI should show no bridge domains \| ${nodes['DUT1']} \| | | [Arguments] | ${node} -| | Run Keyword And Expect Error | ValueError: No JSON object could be decoded -| | ... | VPP get bridge domain data | ${node} +| | ${data}= | VPP get bridge domain data | ${node} +| | Should be empty | ${data} | Honeycomb adds interface to bridge domain | | [Documentation] | Uses Honeycomb API to assign interface to a bridge\ diff --git a/resources/libraries/robot/honeycomb/l2_fib.robot b/resources/libraries/robot/honeycomb/l2_fib.robot index 6889fb2af4..d103d41de6 100644 --- a/resources/libraries/robot/honeycomb/l2_fib.robot +++ b/resources/libraries/robot/honeycomb/l2_fib.robot @@ -149,7 +149,7 @@ | | ... | Modify L2 FIB Entry | | ... | ${node} | ${bd_name} | ${mac} | ${param} | ${value} -| L2 FIB entry from VAT should be +| L2 FIB entry from PAPI should be | | [Documentation] | Retrieves the operational data about the specified L2 \ | | ... | FIB entry using Python API and checks if it is as expected. | | ... @@ -159,7 +159,7 @@ | | ... | - l2_fib_ref_data - L2 FIB entry referential data. Type: dictionay | | ... | | ... | *Example:* -| | ... | \| L2 FIB entry from VAT should be \ +| | ... | \| L2 FIB entry from PAPI should be \ | | ... | \| ${nodes['DUT1']} \| test_bd \| ${l2_fib_forward_oper} \| | | ... | | [Arguments] | ${node} | ${bd_index} | ${l2_fib_ref_data} @@ -168,7 +168,7 @@ | | ... | ${l2_fib_ref_data['mac']} | | Compare Data Structures | ${l2_fib_data} | ${l2_fib_ref_data} -| L2 FIB Table from VAT should be empty +| L2 FIB Table from PAPI should be empty | | [Documentation] | Check if the L2 FIB table in the specified bridge domain \ | | ... | is empty. Python API is used to get operational data. | | ... @@ -177,7 +177,7 @@ | | ... | - bd_index - Index of the bridge domain. Type: integer | | ... | | ... | *Example:* -| | ... | \| L2 FIB Table from VAT should be empty \ +| | ... | \| L2 FIB Table from PAPI should be empty \ | | ... | \| ${nodes['DUT1']} \| test_bd \| | | ... | | [Arguments] | ${node} | ${bd_index} diff --git a/resources/libraries/robot/honeycomb/persistence.robot b/resources/libraries/robot/honeycomb/persistence.robot index 257f227abe..969b333815 100644 --- a/resources/libraries/robot/honeycomb/persistence.robot +++ b/resources/libraries/robot/honeycomb/persistence.robot @@ -156,7 +156,7 @@ | | Interface state from VAT should be | ${node} | ${interface} | up | | Sub-interface bridge domain Operational Data From Honeycomb Should Be | | ... | ${node} | ${interface} | ${sub_if_id} | ${sub_bd_settings} -| | Sub-interface bridge domain Operational Data From VAT Should Be +| | Sub-interface bridge domain Operational Data From PAPI Should Be | | ... | ${node} | ${sub_if_name} | ${sub_bd_settings} | | Rewrite tag from Honeycomb should be | | ... | ${node} | ${interface} | ${sub_if_id} | ${tag_rewrite_pop_1_oper} @@ -184,7 +184,7 @@ | | ... | ${node} | ${vx_interface} | | VxLAN Operational Data From VAT Should Be empty | ${node} | | Honeycomb should show no bridge domains | ${node} -| | VAT should show no bridge domains | ${node} +| | PAPI should show no bridge domains | ${node} | | TAP Operational Data From Honeycomb Should Be empty | | ... | ${node} | ${tap_interface} | | TAP Operational Data From VAT Should Be empty @@ -321,5 +321,5 @@ | | ... | ${node} | ${interface} | ${if_bd_settings} | | L2 FIB Entry from Honeycomb should be | | ... | ${node} | ${bd_name} | ${l2_fib_forward_oper} -| | L2 FIB entry from VAT should be +| | L2 FIB entry from PAPI should be | | ... | ${node} | ${bd_index} | ${l2_fib_forward_vat}
\ No newline at end of file diff --git a/resources/libraries/robot/honeycomb/sub_interface.robot b/resources/libraries/robot/honeycomb/sub_interface.robot index 69eb9003d1..a7f739b1b0 100644 --- a/resources/libraries/robot/honeycomb/sub_interface.robot +++ b/resources/libraries/robot/honeycomb/sub_interface.robot @@ -287,7 +287,7 @@ | | Should be equal | ${if_data['bridge-domain']} | | ... | ${settings['bridge-domain']} -| Sub-interface bridge domain Operational Data From VAT Should Be +| Sub-interface bridge domain Operational Data From PAPI Should Be | | [Documentation] | Uses VAT to verify sub-interface assignment to a bridge\ | | ... | domain. | | ... @@ -298,19 +298,20 @@ | | ... | - setings - Parameters to be checked. Type: dictionary | | ... | | ... | *Example:* -| | ... | \| Sub-interface bridge domain Operational Data From VAT Should Be\ +| | ... | \| Sub-interface bridge domain Operational Data From PAPI Should Be\ | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0.1 \| ${sub_bd_setings} \| | | ... | | [Arguments] | ${node} | ${interface} | ${settings} | | ... | | ${bd_data}= | VPP get bridge domain data | ${node} | | ${bd_intf}= | Set Variable | ${bd_data[0]} -| | ${sw_if_data}= | Set Variable | ${bd_intf['sw_if'][0]} +| | ${sw_if_data}= | Set Variable | ${bd_intf['sw_if_details'][0]} | | Should be equal as integers | ${bd_intf['flood']} | ${bd_settings['flood']} | | Should be equal as integers | ${bd_intf['forward']} | | ... | ${bd_settings['forward']} | | Should be equal as integers | ${bd_intf['learn']} | ${bd_settings['learn']} -| | Should be equal as strings | ${sw_if_data['shg']} +# interface[1] = sw_if_index, interface[2] = shg +| | Should be equal as strings | ${sw_if_data[2]} | | ... | ${settings['split-horizon-group']} | Honeycomb fails to remove all sub-interfaces |