X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fbridge_domain.robot;h=e26c18d01999ba1ae6c0858b62644ca210392c72;hb=08e35e37f7ad3394cea86c22ab7ffd990651c112;hp=2edf3076ffa6d6f4c710b361a0a304b976cb34ef;hpb=233683de57527f477bf7e8d042a5f3d1f08c7744;p=csit.git diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot index 2edf3076ff..e26c18d019 100644 --- a/resources/libraries/robot/honeycomb/bridge_domain.robot +++ b/resources/libraries/robot/honeycomb/bridge_domain.robot @@ -15,9 +15,7 @@ | Library | resources.libraries.python.L2Util | Library | resources.libraries.python.honeycomb.HcAPIKwBridgeDomain.BridgeDomainKeywords | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords -| ... | WITH NAME | InterfaceAPI | Library | resources.libraries.python.InterfaceUtil -| ... | WITH NAME | interfaceCLI *** Keywords *** | Honeycomb creates first L2 bridge domain @@ -52,7 +50,7 @@ | | [Arguments] | ${node} | ${bd_name} | ${settings} | | Add BD | ${node} | ${bd_name} | &{settings} -| Bridge domain configuration from Honeycomb should be +| Bridge domain Operational Data From Honeycomb Should Be | | [Documentation] | Uses Honeycomb API to verify bridge domain settings\ | | ... | against provided values. | | ... @@ -63,14 +61,14 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Bridge domain configuration from Honeycomb should be \ +| | ... | \| Bridge domain Operational Data From Honeycomb Should Be \ | | ... | \| ${nodes['DUT1']} \| bd-04 \| ${{flood:True,learn:False}} \| | | [Arguments] | ${node} | ${bd_name} | ${settings} | | ${api_data}= | Get bd oper data | ${node} | ${bd_name} | | :FOR | ${key} | IN | @{settings.keys()} | | | Should be equal | ${settings['${key}']} | ${api_data['${key}']} -| Bridge domain configuration from VAT should be +| Bridge domain Operational Data From VAT Should Be | | [Documentation] | Uses VAT to verify bridge domain settings\ | | ... | against provided values. | | ... @@ -81,7 +79,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Bridge domain configuration from VAT should be \ +| | ... | \| Bridge domain Operational Data From VAT Should Be \ | | ... | \| ${nodes['DUT1']} \| bd-04 \| ${{flood:True,learn:False}} \| | | [Arguments] | ${node} | ${bd_index} | ${settings} | | ${vat_data}= | VPP get bridge domain data | ${node} @@ -109,9 +107,9 @@ | | ... | \| ${{split_horizon_group:2, bvi:False}} \| | | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name} | | ... | ${settings} -| | interfaceAPI.Add bridge domain to interface +| | Add bridge domain to interface | | ... | ${node} | ${interface1} | ${bd_name} | &{settings} -| | interfaceAPI.Add bridge domain to interface +| | Add bridge domain to interface | | ... | ${node} | ${interface2} | ${bd_name} | &{settings} | Honeycomb should show interfaces assigned to bridge domain @@ -133,9 +131,9 @@ | | ... | \| bd-04 \| ${{split_horizon_group:2, bvi:False}} \| | | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name} | | ... | ${settings} -| | ${if1_data}= | interfaceAPI.Get interface oper data +| | ${if1_data}= | Get interface oper data | | ... | ${node} | ${interface1} -| | ${if2_data}= | interfaceAPI.Get interface oper data +| | ${if2_data}= | Get interface oper data | | ... | ${node} | ${interface2} | | Should be equal | ${if1_data['v3po:l2']['bridge-domain']} | | ... | ${if2_data['v3po:l2']['bridge-domain']} | ${bd_name} @@ -178,39 +176,6 @@ | | | Should contain | ${if_indices} | ${interface['sw_if_index']} | | | Should be equal | ${interface['shg']} | ${settings['split_horizon_group']} -| Honeycomb should not show interfaces assigned to bridge domain -| | [Documentation] | Uses Honeycomb API to verify interfaces are not assigned\ -| | ... | to bridge domain. -| | ... -| | ... | *Arguments:* -| | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - interface1, interface2 - Names of interfaces to check\ -| | ... | bridge domain assignment on. Type: string -| | ... | - bd_name - Name of the bridge domain. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Honeycomb should not show interfaces assigned to bridge domain \ -| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \ -| | ... | \| bd-04 \| -| | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name} -| | ${if1_data_oper}= | interfaceAPI.Get interface oper data -| | ... | ${node} | ${interface1} -| | ${if2_data_oper}= | interfaceAPI.Get interface oper data -| | ... | ${node} | ${interface2} -| | ${if1_data_cfg}= -| | ... | interfaceAPI.Get interface cfg data | ${node} | ${interface1} -| | ${if1_data_cfg}= -| | ... | interfaceAPI.Get interface cfg data | ${node} | ${interface2} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if1_data_oper['v3po:l2']} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if2_data_oper['v3po:l2']} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if1_data_cfg['v3po:l2']} -| | Run keyword and expect error | *KeyError: 'v3po:l2'* -| | ... | Set Variable | ${if2_data_cfg['v3po:l2']} - | Honeycomb removes all bridge domains | | [Documentation] | Uses Honeycomb API to remove all bridge domains from the \ | | ... | VPP node. @@ -237,8 +202,8 @@ | | ... | | ... | \| Honeycomb should show no bridge domains \| ${nodes['DUT1']} \| | | [Arguments] | ${node} -| | ${bd_data}= | Get all BDs oper data | ${node} -| | Should be empty | ${bd_data} +| | Run keyword and expect error | *Not possible*Status code: 404* +| | ... | Get all BDs oper data | ${node} | VAT should show no bridge domains | | [Documentation] | Uses VAT to verify the removal of all bridge domains. @@ -273,12 +238,12 @@ | | ... | | [Arguments] | ${node} | ${interface} | ${bd_name} | ${settings} | | ... -| | interfaceAPI.Add bridge domain to interface +| | Add bridge domain to interface | | ... | ${node} | ${interface} | ${bd_name} | | ... | ${settings['split-horizon-group']} | | ... | ${settings['bridged-virtual-interface']} -| Bridge domain configuration in interface operational data should be empty +| Bridge domain Operational Interface Assignment should be empty | | [Documentation] | Get interface operational data and retrieve bridge | | ... | domain configuration from it. It should be empty. | | ... @@ -288,16 +253,16 @@ | | ... | will be checked.Type: string | | ... | | ... | *Example:* -| | ... | \| Bridge domain configuration in interface operational data should \ +| | ... | \| Bridge domain Operational Interface Assignment should \ | | ... | be empty \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| | | ... | | [Arguments] | ${node} | ${interface} | | ... -| | ${if_data}= | interfaceAPI.Get BD Oper Data From Interface +| | ${if_data}= | Get BD Oper Data From Interface | | ... | ${node} | ${interface} | | Should be empty | ${if_data} -| Bridge domain configuration in interface operational data should be +| Bridge domain Operational Interface Assignment should be | | [Documentation] | Get interface operational data and retrieve bridge | | ... | domain configuration from it. Compare the data to the expected one. | | ... @@ -308,26 +273,11 @@ | | ... | - bd_settings - The referential bridge domain data. Type: dictionary | | ... | | ... | *Example:* -| | ... | \| Bridge domain configuration in interface operational data should \ +| | ... | \| Bridge domain Operational Interface Assignment should \ | | ... | be \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${if_bd_settings} \| | | ... | | [Arguments] | ${node} | ${interface} | ${bd_settings} | | ... -| | ${if_data}= | interfaceAPI.Get BD Oper Data From Interface +| | ${if_data}= | Get BD Oper Data From Interface | | ... | ${node} | ${interface} -| | interfaceAPI.Compare Data Structures | ${if_data} | ${bd_settings} - -| VAT removes bridge domain -| | [Documentation] Remove the specified bridge domain using VAT. -| | ... -| | ... | *Arguments:* -| | ... | - node - Information about a DUT node. Type: dictionary -| | ... | - bd_id - Bridge domain ID. Type: integer -| | ... -| | ... | *Example:* -| | ... | \| VAT removes bridge domain \ -| | ... | \| ${nodes['DUT1']} \| 1 \| -| | ... -| | [Arguments] | ${node} | ${bd_id} -| | ... -| | Delete Bridge Domain VAT | ${node} | ${bd_id} +| | Compare Data Structures | ${if_data} | ${bd_settings}