CSIT-405: Honeycomb test update and cleanup

 - update suite setup and constants to allow test runs again
 - cleanup basic interface keywords
 - cleanup L2-fib test data
 - add "continue on failure" keyword to some partially failing tests
 - add teardown to all suites, restarts honeycomb if suite had test failures
 - fix minor PEP-8 violations in Topology.py

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

1 files changed, 157 insertions, 127 deletions

diff --git a/resources/test_data/honeycomb/l2_fib.py b/resources/test_data/honeycomb/l2_fib.py
index b06193ad1d..d1600fc46d 100644
--- a/resources/test_data/honeycomb/l2_fib.py
+++ b/resources/test_data/honeycomb/l2_fib.py
@@ -13,130 +13,160 @@
 
 """Test variables for Honeycomb L2 FIB test suite."""
 
-# Bridge domain name.
-bd_name = 'test-l2-bd'
-bd_index = 1
-
-# Bridge domain settings used while creating a test bridge domain.
-bd_settings = {
-    'flood': True,
-    'forward': True,
-    'learn': True,
-    'unknown-unicast-flood': True,
-    'arp-termination': True
-}
-
-# Bridge domain configuration used while adding the bridge domain to an
-# interface.
-if_bd_settings = {
-    'bridge-domain': bd_name,
-    'split-horizon-group': 1,
-    'bridged-virtual-interface': False
-}
-
-# Add L2 FIB entry (forward).
-# Configuration data:
-l2_fib_forward_cfg = {
-    "phys-address": "aa:bb:cc:dd:ee:ff",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "action": "l2-fib-forward"
-}
-
-# Expected operational data:
-l2_fib_forward_oper = {
-    "phys-address": "aa:bb:cc:dd:ee:ff",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "bridged-virtual-interface": False,
-    "action": "v3po:l2-fib-forward",
-    "static-config": False
-}
-
-# Expected VAT data:
-l2_fib_forward_vat = {
-    "mac": int("".join(l2_fib_forward_oper["phys-address"].split(':')), 16),
-    "static_mac": 0,
-    "filter_mac": 0,
-    "bvi_mac": 0
-  }
-
-# Add L2 FIB entry (static, forward).
-# Configuration data:
-l2_fib_static_forward_cfg = {
-    "phys-address": "22:22:33:44:55:66",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "static-config": True,
-    "action": "l2-fib-forward"
-}
-
-# Expected operational data:
-l2_fib_static_forward_oper = {
-    "phys-address": "22:22:33:44:55:66",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "bridged-virtual-interface": False,
-    "action": "v3po:l2-fib-forward",
-    "static-config": True
-}
-
-# Expected VAT data:
-l2_fib_static_forward_vat = {
-    "mac": int("".join(l2_fib_static_forward_oper["phys-address"].
-                       split(':')), 16),
-    "sw_if_index": 5,
-    "static_mac": 1,
-    "filter_mac": 0,
-    "bvi_mac": 0
-}
-
-# Add L2 FIB entry (filter).
-# Configuration data:
-l2_fib_filter_cfg = {
-    "phys-address": "00:01:02:03:04:05",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "static-config": True,
-    "action": "l2-fib-filter"
-}
-
-# Expected operational data:
-l2_fib_filter_oper = {
-    "phys-address": "00:01:02:03:04:05",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "bridged-virtual-interface": False,
-    "action": "v3po:l2-fib-filter",
-    "static-config": True
-}
-
-# Expected VAT data:
-l2_fib_filter_vat = {
-    "mac": int("".join(l2_fib_filter_oper["phys-address"].split(':')), 16),
-    "sw_if_index": 5,
-    "static_mac": 1,
-    "filter_mac": 1,
-    "bvi_mac": 0
-}
-
-# WRONG configuration data - Add L2 FIB entry.
-l2_fib_forward_cfg_wrong_mac = {
-    "phys-address": "WRONG-MAC",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "action": "l2-fib-forward"
-}
-
-l2_fib_forward_cfg_wrong_if = {
-    "phys-address": "aa:bb:cc:dd:ee:ff",
-    "outgoing-interface": "WRONG-INTERFACE",
-    "action": "l2-fib-forward"
-}
-
-l2_fib_forward_cfg_wrong_action = {
-    "phys-address": "aa:bb:cc:dd:ee:ff",
-    "outgoing-interface": "GigabitEthernet0/8/0",
-    "action": "WRONG-ACTION"
-}
-
-# Modify L2 FIB entry (forward).
-# Configuration data:
-l2_fib_forward_modified_cfg = {
-    "phys-address": "aa:bb:cc:dd:ee:ff",
-    "outgoing-interface": "GigabitEthernet0/9/0",
-    "action": "l2-fib-forward"
-}
+from resources.libraries.python.topology import Topology
+
+
+def get_variables(node, interface, interface2):
+    """Creates and returns dictionary of test variables.
+
+    :param node: A Honeycomb node.
+    :param interface: Name of an interface on the specified node.
+    :param interface: Name of another interface on the specified node.
+    :type node: dict
+    :type interface: str
+    :type interface2: str
+    :return: Dictionary of test variables.
+    :rtype: dict
+    """
+    # Interface sw_if_index
+    sw_if_index = Topology.get_interface_sw_index_by_name(node, interface)
+    sw_if_index2 = Topology.get_interface_sw_index_by_name(node, interface2)
+
+    # Bridge domain name.
+    bd_name = 'test-l2-bd'
+
+    # L2 FIB MACs used in configuration.
+    notstatic = "aa:bb:cc:dd:ee:ff"
+    static = "22:22:33:44:55:66"
+    filtered = "00:01:02:03:04:05"
+
+    variables = {
+        'bd_name': bd_name,
+        # Bridge domain settings used while creating a test bridge domain.
+        'bd_settings': {
+            'flood': True,
+            'forward': True,
+            'learn': True,
+            'unknown-unicast-flood': True,
+            'arp-termination': True
+        },
+
+        # Index of created bridge domain.
+        'bd_index': 1,
+
+        # Bridge domain configuration used while adding the bridge domain to an
+        # interface.
+        'if_bd_settings': {
+            'bridge-domain': bd_name,
+            'split-horizon-group': 1,
+            'bridged-virtual-interface': False
+        },
+
+        # Add L2 FIB entry (forward).
+        # Configuration data:
+        'l2_fib_forward_cfg': {
+            "phys-address": notstatic,
+            "outgoing-interface": interface,
+            "action": "l2-fib-forward"
+        },
+
+        # Expected operational data:
+        'l2_fib_forward_oper': {
+            "phys-address": notstatic,
+            "outgoing-interface": interface,
+            "bridged-virtual-interface": False,
+            "action": "v3po:l2-fib-forward",
+            "static-config": False
+        },
+
+        # Expected VAT data:
+        'l2_fib_forward_vat': {
+            "mac": int("".join(notstatic.split(':')), 16),
+            "sw_if_index": sw_if_index,
+            "static_mac": 0,
+            "filter_mac": 0,
+            "bvi_mac": 0
+          },
+
+        # Add L2 FIB entry (static, forward).
+        # Configuration data:
+        'l2_fib_static_forward_cfg': {
+            "phys-address": static,
+            "outgoing-interface": interface,
+            "static-config": True,
+            "action": "l2-fib-forward"
+        },
+
+        # Expected operational data:
+        'l2_fib_static_forward_oper': {
+            "phys-address": static,
+            "outgoing-interface": interface,
+            "bridged-virtual-interface": False,
+            "action": "v3po:l2-fib-forward",
+            "static-config": True
+        },
+
+        # Expected VAT data:
+        'l2_fib_static_forward_vat': {
+            "mac": int("".join(static.split(':')), 16),
+            "sw_if_index": sw_if_index,
+            "static_mac": 1,
+            "filter_mac": 0,
+            "bvi_mac": 0
+        },
+
+        # Add L2 FIB entry (filter).
+        # Configuration data:
+        'l2_fib_filter_cfg': {
+            "phys-address": filtered,
+            "outgoing-interface": interface,
+            "static-config": True,
+            "action": "l2-fib-filter"
+        },
+
+        # Expected operational data:
+        'l2_fib_filter_oper': {
+            "phys-address": filtered,
+            "outgoing-interface": interface,
+            "bridged-virtual-interface": False,
+            "action": "v3po:l2-fib-filter",
+            "static-config": True
+        },
+
+        # Expected VAT data:
+        'l2_fib_filter_vat': {
+            "mac": int("".join(filtered.split(':')), 16),
+            "sw_if_index": sw_if_index,
+            "static_mac": 1,
+            "filter_mac": 1,
+            "bvi_mac": 0
+        },
+
+        # WRONG configuration data - Add L2 FIB entry.
+        'l2_fib_forward_cfg_wrong_mac': {
+            "phys-address": "WRONG-MAC",
+            "outgoing-interface": interface,
+            "action": "l2-fib-forward"
+        },
+
+        'l2_fib_forward_cfg_wrong_if': {
+            "phys-address": notstatic,
+            "outgoing-interface": "WRONG-INTERFACE",
+            "action": "l2-fib-forward"
+        },
+
+        'l2_fib_forward_cfg_wrong_action': {
+            "phys-address": notstatic,
+            "outgoing-interface": interface,
+            "action": "WRONG-ACTION"
+        },
+
+        # Modify L2 FIB entry (forward).
+        # Configuration data:
+        'l2_fib_forward_modified_cfg': {
+            "phys-address": notstatic,
+            "outgoing-interface": sw_if_index2,
+            "action": "l2-fib-forward"
+        }
+    }
+    return variables