CSIT-506: HC Test- Update and cleanup all suites

 - remove EXPECTED_FAILING tag from IPv4 neighbor, IPv6 address, MTU
 - fix bridge domain removal with interfaces assigned, it should fail
 - fix teardown of L2 FIB suite (bridge domain removal, see above)
 - disable vhost-user "server" test cases (VPP bug)
 - fix keyword verifying sub-interface state
 - update ACL test data (yang model changes)
 - remove EXPECTED_FAILING tag from ACL table removal test
 - update Jira IDs and comments in failing Lisp test case
 - remove EXPECTED_FAILING tag from Lisp removal test case
 - use vhost-user "client" instead of "server" in persistence tests

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

5 files changed, 70 insertions, 15 deletions

diff --git a/resources/test_data/honeycomb/acl.py b/resources/test_data/honeycomb/acl.py
index ee7f9525b8..46b88dad83 100644
--- a/resources/test_data/honeycomb/acl.py
+++ b/resources/test_data/honeycomb/acl.py
@@ -17,6 +17,7 @@
 hc_acl_table = {
     "name": "acl_table_test",
     "nbuckets": 1,
+    "memory_size": 1048576,
     "skip_n_vectors": 0,
     "miss_next": "permit",
     "mask": "00:00:00:00:00:00:ff:ff:ff:ff:ff:ff:00:00:00:00"
@@ -25,11 +26,31 @@ hc_acl_table = {
 hc_acl_table2 = {
     "name": "acl_table_test2",
     "nbuckets": 2,
+    "memory_size": 1048576,
     "skip_n_vectors": 1,
     "next_table": "acl_table_test",
     "miss_next": "deny",
     "mask": "ff:ff:ff:00:00:00:ff:ff:ff:ff:ff:ff:00:00:00:00"
 }
+
+#TODO: remove once memory_size is visible in oper data(HC2VPP-10)
+hc_acl_table_oper = {
+    "name": "acl_table_test",
+    "nbuckets": 1,
+    "skip_n_vectors": 0,
+    "miss_next": "permit",
+    "mask": "00:00:00:00:00:00:ff:ff:ff:ff:ff:ff:00:00:00:00"
+}
+
+hc_acl_table2_oper = {
+    "name": "acl_table_test2",
+    "nbuckets": 2,
+    "skip_n_vectors": 1,
+    "next_table": "acl_table_test",
+    "miss_next": "deny",
+    "mask": "ff:ff:ff:00:00:00:ff:ff:ff:ff:ff:ff:00:00:00:00"
+}
+
 # representation of table settings in VAT
 table_index = 0
 vat_acl_table = {
diff --git a/resources/test_data/honeycomb/l2_fib.py b/resources/test_data/honeycomb/l2_fib.py
index d1600fc46d..c8fabdc943 100644
--- a/resources/test_data/honeycomb/l2_fib.py
+++ b/resources/test_data/honeycomb/l2_fib.py
@@ -119,7 +119,6 @@ def get_variables(node, interface, interface2):
         # Configuration data:
         'l2_fib_filter_cfg': {
             "phys-address": filtered,
-            "outgoing-interface": interface,
             "static-config": True,
             "action": "l2-fib-filter"
         },
@@ -127,7 +126,6 @@ def get_variables(node, interface, interface2):
         # 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
@@ -136,7 +134,6 @@ def get_variables(node, interface, interface2):
         # 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
diff --git a/resources/test_data/honeycomb/lisp.py b/resources/test_data/honeycomb/lisp.py
index 049d222b7b..12a614698c 100644
--- a/resources/test_data/honeycomb/lisp.py
+++ b/resources/test_data/honeycomb/lisp.py
@@ -108,25 +108,61 @@ lisp_settings_enable = {
     }
 }
 
-remote_vrf_adjacency = {
-                    "adjacency": {
+prepare_vrf_adjacency = {
+    "virtual-network-identifier": 7,
+    "vrf-subtable": {
+        "table-id": 3,
+        "local-mappings": {
+            "local-mapping": [{
+                "id": "local_map_vrf",
+                "eid": {
+                    "virtual-network-id": 7,
+                    "address-type": "ietf-lisp-address-types:ipv4-afi",
+                    "ipv4": "192.168.1.1"
+                },
+                "locator-set": locator_set
+            }]
+        },
+        "remote-mappings": {
+            "remote-mapping": [{
+                "id": "remote_map_vrf",
+                "eid": {
+                    "virtual-network-id": 7,
+                    "address-type": "ietf-lisp-address-types:ipv4-afi",
+                    "ipv4": "192.168.0.2"
+                },
+                "rlocs": {
+                    "locator": [{
+                        "address": "192.168.0.3",
+                        "priority": 1,
+                        "weight": 1
+                    }]
+                },
+
+            }]
+        },
+    }
+}
+
+vrf_adjacency = {
+                    "adjacency": [{
                         "id": "adj01",
                         "local-eid": {
-                            "virtual-network-id": 4,
+                            "virtual-network-id": 7,
                             "address-type": "ietf-lisp-address-types:ipv4-afi",
                             "ipv4": "192.168.1.1"
                         },
                         "remote-eid": {
-                            "virtual-network-id": 4,
+                            "virtual-network-id": 7,
                             "address-type": "ietf-lisp-address-types:ipv4-afi",
                             "ipv4": "192.168.0.2"
                         },
-                    }
+                    }]
                 }
 
-remote_adj_subtable = deepcopy(remote_vrf_subtable)
-remote_adj_subtable["vrf-subtable"]["remote-mappings"]\
-    ["remote-mapping"][0]["adjacencies"] = {}.update(remote_vrf_adjacency)
+adj_subtable = deepcopy(prepare_vrf_adjacency)
+adj_subtable["vrf-subtable"]["remote-mappings"]\
+    ["remote-mapping"][0]["adjacencies"] = deepcopy(vrf_adjacency)
 
 
 def create_settings_dict(subtable):
@@ -142,6 +178,7 @@ lisp_settings_remote_bd = create_settings_dict(remote_bd_subtable)
 lisp_settings_remote_vrf = create_settings_dict(remote_vrf_subtable)
 lisp_settings_local_bd = create_settings_dict(local_bd_subtable)
 lisp_settings_local_vrf = create_settings_dict(local_vrf_subtable)
+lisp_settings_both_vrf = create_settings_dict(prepare_vrf_adjacency)
 
 vat_remote_bd = {
     "is_local": 0,
diff --git a/resources/test_data/honeycomb/nat.py b/resources/test_data/honeycomb/nat.py
index d56fcfff56..fe2894b469 100644
--- a/resources/test_data/honeycomb/nat.py
+++ b/resources/test_data/honeycomb/nat.py
@@ -87,11 +87,11 @@ def get_variables(node, interface):
             }
         ],
         "nat_interface_vat_in": [
-            {"sw_if_index": sw_if_index,
+            {"sw_if_index": str(sw_if_index),
              "direction": "in"}
         ],
         "nat_interface_vat_out": [
-            {"sw_if_index": sw_if_index,
+            {"sw_if_index": str(sw_if_index),
              "direction": "out"}
         ]
     }
diff --git a/resources/test_data/honeycomb/persistence.py b/resources/test_data/honeycomb/persistence.py
index f46cfba597..216d4facef 100644
--- a/resources/test_data/honeycomb/persistence.py
+++ b/resources/test_data/honeycomb/persistence.py
@@ -50,8 +50,8 @@ def get_variables(interface):
                          },
         # vhost-user interface settings
         'vhost_interface': 'test_vhost',
-        'vhost_user_server': {'socket': 'soc1',
-                              'role': 'server'
+        'vhost_user_client': {'socket': 'soc1',
+                              'role': 'client'
                               },
         # Vlan subinterface settings
         'sub_if_id': sub_if_id,