Merge pull request #73 from napalm-automation/develop

Release 0.4.3 - master

Author: mirceaulinic

napalm_junos/junos.py

@@ -15,6 +15,8 @@
 
 """Driver for JunOS devices."""
 
+from __future__ import unicode_literals
+
 # import stdlib
 import re
 import collections
@@ -33,6 +35,7 @@
 import napalm_base.helpers
 from napalm_base.base import NetworkDriver
 from napalm_base.utils import string_parsers
+from napalm_base.utils import py23_compat
 from napalm_base.exceptions import ConnectionException
 from napalm_base.exceptions import MergeConfigException
 from napalm_base.exceptions import CommandErrorException
@@ -948,14 +951,15 @@ def get_mac_address_table(self):
 
         return mac_address_table
 
-    def get_route_to(self, destination='', protocol=''):
+    def get_route_to(self, destination=None, protocol=None):
         """Return route details to a specific destination, learned from a certain protocol."""
         routes = {}
 
-        if not isinstance(destination, str):
+        if not isinstance(destination, py23_compat.string_types):
             raise TypeError('Please specify a valid destination!')
 
-        if not isinstance(protocol, str) or protocol.lower() not in ['static', 'bgp', 'isis']:
+        if not isinstance(protocol, py23_compat.string_types) or \
+           protocol.lower() not in ('static', 'bgp', 'isis'):
             raise TypeError("Protocol not supported: {protocol}.".format(
                 protocol=protocol
             ))
@@ -1253,6 +1257,10 @@ def get_users(self):
                 d[0]: d[1] for d in user_entry[1] if d[1]
             })
             user_class = user_details.pop('class', '')
+            user_details = {
+                key: py23_compat.text_type(user_details[key])
+                for key in user_details.keys()
+            }
             level = _JUNOS_CLASS_CISCO_PRIVILEGE_LEVEL_MAP.get(user_class, 0)
             user_details.update({
                 'level': level
@@ -1335,11 +1343,11 @@ def get_config(self, retrieve='all'):
 
         if retrieve in ('candidate', 'all'):
             config = self.device.rpc.get_config(filter_xml=None, options=options)
-            rv['candidate'] = config.text.encode('ascii', 'replace')
+            rv['candidate'] = py23_compat.text_type(config.text.encode('ascii', 'replace'))
 
         if retrieve in ('running', 'all'):
             options['database'] = 'committed'
             config = self.device.rpc.get_config(filter_xml=None, options=options)
-            rv['running'] = config.text.encode('ascii', 'replace')
+            rv['running'] = py23_compat.text_type(config.text.encode('ascii', 'replace'))
 
         return rv

requirements.txt

@@ -1,2 +1,2 @@
-napalm_base==0.17.0
+napalm-base>=0.18.0
 junos-eznc

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="napalm-junos",
-    version="0.4.2",
+    version="0.4.3",
     packages=find_packages(),
     author="David Barroso, Mircea Ulinic",
     author_email="[email protected], [email protected]",