aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2017-01-17 16:59:03 +0100
committerPeter Mikus <pmikus@cisco.com>2017-01-27 14:54:19 +0000
commitfc42ade3d5c7ed279e867cb55ca42a44db5e706d (patch)
treeefe592ce21ea62d3c6723a994a10eb707966fa11 /resources/libraries/python
parentc53c0cbad736e937a4a41bf13eff4c5d8b5dcb55 (diff)
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>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r--resources/libraries/python/NAT.py9
-rw-r--r--resources/libraries/python/honeycomb/HcAPIKwInterfaces.py9
2 files changed, 10 insertions, 8 deletions
diff --git a/resources/libraries/python/NAT.py b/resources/libraries/python/NAT.py
index d0e01c7f84..e30381682c 100644
--- a/resources/libraries/python/NAT.py
+++ b/resources/libraries/python/NAT.py
@@ -64,7 +64,7 @@ class NATUtil(object):
"vrf": items[4]
})
else:
- raise RuntimeError("Unexpected output from span_mapping_dump.")
+ raise RuntimeError("Unexpected output from snat_mapping_dump.")
return data
@@ -90,8 +90,9 @@ class NATUtil(object):
data = []
for line in lines:
items = line.split(" ")
- while "" in items:
- items.remove("")
+ for trash in ("", "vat#"):
+ while trash in items:
+ items.remove(trash)
if len(items) == 0:
continue
elif len(items) == 3:
@@ -102,6 +103,6 @@ class NATUtil(object):
})
else:
raise RuntimeError(
- "Unexpected output from span_interface_dump.")
+ "Unexpected output from snat_interface_dump.")
return data
diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index 1e0883db27..a62cee85c7 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
@@ -1143,7 +1143,7 @@ class InterfaceKeywords(object):
path = ("interfaces",
("interface", "name", super_interface),
"vpp-vlan:sub-interfaces",
- ("sub-interface", "identifier", identifier),
+ ("sub-interface", "identifier", int(identifier)),
"enabled")
return InterfaceKeywords._set_interface_properties(
@@ -1375,10 +1375,11 @@ class InterfaceKeywords(object):
else:
raise HoneycombError(
- "Unexpected data type {data_type}, reference type is"
- " {ref_type}. Must be list or dictionary.".format(
+ "Unexpected data type {data_type} in path {path}, reference"
+ " type is {ref_type}. Must be list or dictionary.".format(
data_type=type(data),
- ref_type=type(ref)))
+ ref_type=type(ref),
+ path=_path))
@staticmethod
def compare_interface_lists(list1, list2):