X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fbridge_domain.robot;h=e26c18d01999ba1ae6c0858b62644ca210392c72;hp=76122fa8f9549a42e392970a2872f1be7a1a94fc;hb=9ce4ca3b24e45bc9c4ad06e09829ccba1addbd62;hpb=4f5f136f8d445c60db38c9f59622f379f04ff3bb

diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot
index 76122fa8f9..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,34 +107,11 @@
 | | ... | \| ${{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 fails to add interfaces to bridge domain
-| | [Documentation] | Uses Honeycomb API to assign interfaces to a bridge\
-| | ... | domain.
-| | ...
-| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - interface1, interface2 - names of interfaces to assign to bridge\
-| | ... | domain. Type: string
-| | ... | - bd_name - name of the bridge domain. Type: string
-| | ... | - settings - bridge domain specific interface settings.\
-| | ... | Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Honeycomb fails to add interfaces to bridge domain \
-| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \
-| | ... | \| bd-04 \| ${{split_horizon_group:2, bvi:True}} \|
-| | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name}
-| | ... | ${settings}
-| | Run keyword and expect error | *Failed to validate*
-| | ... | Honeycomb adds interfaces to bridge domain | ${node} | ${interface1}
-| | ... | ${interface2} | ${bd_name} | ${settings}
-
 | Honeycomb should show interfaces assigned to bridge domain
 | | [Documentation] | Uses Honeycomb API to verify interface assignment to\
 | | ... | bridge domain.
@@ -156,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}
@@ -169,29 +144,6 @@
 | | ... | ${if2_data['v3po:l2']['bridged-virtual-interface']}
 | | ... | ${settings['bvi']}
 
-| Honeycomb should not show interfaces assigned to bridge domain
-| | [Documentation] | Uses Honeycomb API to verify interface assignment 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
-| | ... | - settings - bridge domain specific interface settings.\
-| | ... | Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Honeycomb should not show interfaces assigned to bridge domain \
-| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| GigabitEthernet0/9/0 \
-| | ... | \| bd-04 \| ${{split_horizon_group:2, bvi:False}} \|
-| | [Arguments] | ${node} | ${interface1} | ${interface2} | ${bd_name}
-| | ... | ${settings}
-| | Run keyword and expect error | *ValueError*
-| | ... | Honeycomb should show interfaces assigned to bridge domain
-| | ... | ${node} | ${interface1} | ${interface2} | ${bd_name} | ${settings}
-
 | VAT should show interfaces assigned to bridge domain
 | | [Documentation] | Uses VAT to verify interface assignment to\
 | | ... | bridge domain.
@@ -212,9 +164,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]}
@@ -222,30 +176,6 @@
 | | | Should contain | ${if_indices} | ${interface['sw_if_index']}
 | | | Should be equal | ${interface['shg']} | ${settings['split_horizon_group']}
 
-| VAT should not show interfaces assigned to bridge domain
-| | [Documentation] | Uses VAT to verify interface assignment to\
-| | ... | bridge domain, and expects to fail.
-| | ...
-| | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
-| | ... | - index - index of bridge domains on VPP node. Starts from 0,\
-| | ... | new BDs reuse numbers after a bridge domain is removed. Type: integer
-| | ... | - interface1, interface2 - names of interfaces to check bridge domain\
-| | ... | assignment on. Type: string
-| | ... | - settings - bridge domain specific interface settings.\
-| | ... | Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| VAT should not 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}
-| | ... | ${settings}
-| | Run keyword and expect error | *No JSON object could be decoded*
-| | ... | VAT should show interfaces assigned to bridge domain
-| | ... | ${node} | ${index} | ${interface1} | ${interface2} | ${settings}
-
 | Honeycomb removes all bridge domains
 | | [Documentation] | Uses Honeycomb API to remove all bridge domains from the \
 | | ... | VPP node.
@@ -256,8 +186,10 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Honeycomb removes all bridge domains \| ${nodes['DUT1']} \|
-| | [Arguments] | ${node}
-| | Remove all bds | ${node}
+| | [Arguments] | ${node} | @{interfaces}
+| | :FOR | ${interface} | IN | @{interfaces}
+| | | Remove bridge domain from interface | ${node} | ${interface}
+| | Remove all bridge domains | ${node}
 
 | Honeycomb should show no bridge domains
 | | [Documentation] | Uses Honeycomb API to verify the removal of all\
@@ -270,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.
@@ -306,12 +238,12 @@
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${bd_name} | ${settings}
 | | ...
-| | interfaceAPI.Add bridge domain to interface
-| | ... | ${node} | ${interface} | ${settings['bridge-domain']}
+| | 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.
 | | ...
@@ -321,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.
 | | ...
@@ -341,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}