X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fbridge_domain.robot;h=e680e82ad4631735cbf7d075203e432e5fb3c7b3;hp=a286d11907f5edc61e54e73aa2506ba6f0bb898d;hb=4e565011b2e53f99fb78e1143e6543b3427de79a;hpb=6bfae6634aa26c2e88dddf49d91245d880b0222b

diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot
index a286d11907..e680e82ad4 100644
--- a/resources/libraries/robot/honeycomb/bridge_domain.robot
+++ b/resources/libraries/robot/honeycomb/bridge_domain.robot
@@ -52,7 +52,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 +63,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 +81,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}
@@ -178,39 +178,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.
@@ -278,7 +245,7 @@
 | | ... | ${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,7 +255,7 @@
 | | ... | 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}
@@ -297,7 +264,7 @@
 | | ... | ${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,7 +275,7 @@
 | | ... | - 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}
@@ -316,18 +283,3 @@
 | | ${if_data}= | interfaceAPI.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}