CSIT-369 Update Honeycomb persistence data location

 - update persistence cleanup method with new file path
 - remove unnecessary test case for bvi in multiple bridge domains
 - remove unused bridge domain keywords

Change-Id: Ib5378f47af4a03ec5663a79db4c0dc1bf054c557
Signed-off-by: selias <samelias@cisco.com>

diff --git a/resources/libraries/python/honeycomb/HcPersistence.py b/resources/libraries/python/honeycomb/HcPersistence.py
index adb55f5..4d19252 100644 (file)
--- a/resources/libraries/python/honeycomb/HcPersistence.py
+++ b/resources/libraries/python/honeycomb/HcPersistence.py
@@ -40,8 +40,7 @@ class HcPersistence(object):
         :type nodes: list
         :raises HoneycombError: If persisted configuration could not be removed.
         """
-        cmd = "rm {0}/etc/opendaylight/honeycomb/*".format(
-            Const.REMOTE_HC_DIR)
+        cmd = "rm {0}/data/persistence/honeycomb/*".format(Const.REMOTE_HC_DIR)
         for node in nodes:
             if node['type'] == NodeType.DUT:
                 ssh = SSH()

diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot
index f8951e6..99befc9 100644 (file)
--- a/resources/libraries/robot/honeycomb/bridge_domain.robot
+++ b/resources/libraries/robot/honeycomb/bridge_domain.robot
@@ -114,29 +114,6 @@
 | | interfaceAPI.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.
@@ -169,29 +146,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.
@@ -224,30 +178,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.

diff --git a/tests/func/honeycomb/020_bridge_domain.robot b/tests/func/honeycomb/020_bridge_domain.robot
index 0bd4463..d4293dc 100644 (file)
--- a/tests/func/honeycomb/020_bridge_domain.robot
+++ b/tests/func/honeycomb/020_bridge_domain.robot
@@ -90,16 +90,3 @@
 | | When Honeycomb removes all bridge domains | ${node}
 | | Then Honeycomb should show no bridge domains | ${node}
 | | And VAT should show no bridge domains | ${node}
-
-| Honeycomb does not assign two bridged virtual interfaces to one bridge domain.
-| | [Documentation] | Check if Honeycomb can assign two bridged virtual\
-| | ... | interfaces to a single bridge domain, and expect to fail.
-| | [Teardown] | Honeycomb removes all bridge domains | ${node}
-| | Given Honeycomb creates first l2 bridge domain
-| | ... | ${node} | ${bd1_name} | ${bd_settings}
-| | When Honeycomb fails to add interfaces to bridge domain
-| | ... | ${node} | @{interfaces} | ${bd1_name} | ${if_settings2}
-| | Then Honeycomb should not show interfaces assigned to bridge domain
-| | ... | ${node} | @{interfaces} | ${bd1_name} | ${if_settings2}
-| | And VAT should not show interfaces assigned to bridge domain
-| | ... | ${node} | ${0} | @{interfaces} | ${if_settings2}