diff options
Diffstat (limited to 'resources/libraries/python')
| -rw-r--r-- | resources/libraries/python/NAT.py | 9 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HcAPIKwInterfaces.py | 9 |
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): |