more consitent test, fix st

napalm-automation · Nov 19, 2017 · 6395912 · 6395912
1 parent ef89a31
commit 6395912
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/napalm/base/helpers.py b/napalm/base/helpers.py
@@ -289,7 +289,7 @@ def canonical_interface_name(interface, addl_name_map=None):
     # check in dict for mapping
     if name_map.get(interface_type):
         long_int = name_map.get(interface_type)
-        return long_int + str(interface_number)
+        return long_int + py23_compat.text_type(interface_number)
     # if nothing matched, return the original name
     else:
         return interface
@@ -327,7 +327,7 @@ def abbreviated_interface_name(interface, addl_name_map=None, addl_reverse_map=N
         canonical_type = interface_type
 
     try:
-        abbreviated_name = rev_name_map[canonical_type] + str(interface_number)
+        abbreviated_name = rev_name_map[canonical_type] + py23_compat.text_type(interface_number)
         return abbreviated_name
     except KeyError:
         pass

diff --git a/test/base/test_helpers.py b/test/base/test_helpers.py
@@ -403,10 +403,10 @@ def test_canonical_interface_name(self):
         self.assertEqual(napalm.base.helpers.canonical_interface_name('lo0'), "Loopback0")
         self.assertEqual(napalm.base.helpers.canonical_interface_name('no_match0/1'),
                          "no_match0/1")
-        self.assertEqual(napalm.base.helpers.canonical_interface_name('lo',
-                         addl_name_map={"lo": "something_custom"}), "something_custom")
-        self.assertEqual(napalm.base.helpers.canonical_interface_name('uniq',
-                         addl_name_map={"uniq": "something_custom"}), "something_custom")
+        self.assertEqual(napalm.base.helpers.canonical_interface_name('lo10',
+                         addl_name_map={"lo": "something_custom"}), "something_custom10")
+        self.assertEqual(napalm.base.helpers.canonical_interface_name('uniq0/1/1',
+                         addl_name_map={"uniq": "something_custom"}), "something_custom0/1/1")
 
     def test_abbreviated_interface_name(self):
         """Test the abbreviated_interface_name helper function."""
@@ -420,8 +420,8 @@ def test_abbreviated_interface_name(self):
                          "Hu105/1/1")
         self.assertEqual(napalm.base.helpers.abbreviated_interface_name('Lo0'), "Lo0")
         self.assertEqual(napalm.base.helpers.abbreviated_interface_name('lo0'), "Lo0")
-        self.assertEqual(napalm.base.helpers.abbreviated_interface_name('no_match0/1'),
-                         "no_match0/1")
+        self.assertEqual(napalm.base.helpers.abbreviated_interface_name('something_custom0/1'),
+                         "something_custom0/1")
         self.assertEqual(napalm.base.helpers.abbreviated_interface_name('loop10',
                          addl_name_map={"loop": "Loopback"}), "Lo10")
         self.assertEqual(napalm.base.helpers.abbreviated_interface_name('loop10',