Merge pull request #853 from vnitinv/evo-on-box

Handle newer junos devices
Juniper · Aug 2, 2018 · d5e9c39 · d5e9c39
2 parents 84a5819 + dfe1240
commit d5e9c39
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/jnpr/junos/device.py b/lib/jnpr/junos/device.py
@@ -71,9 +71,9 @@ def _in_path(dir):
 
 
 class _Connection(object):
-
     ON_JUNOS = platform.system().upper() == 'JUNOS' or \
-        platform.release().startswith('JNPR')
+        platform.release().startswith('JNPR') or \
+               os.path.isfile('/usr/share/cevo/cevo_version')
     auto_probe = 0          # default is no auto-probe
 
     # ------------------------------------------------------------------------
@@ -1248,7 +1248,8 @@ def open(self, *vargs, **kvargs):
                 key_filename=self._ssh_private_key_file,
                 allow_agent=allow_agent,
                 ssh_config=self._sshconf_lkup(),
-                device_params={'name': 'junos', 'local': False})
+                device_params={'name': 'junos', 'local':
+                    self.__class__.ON_JUNOS})
             self._conn._session.add_listener(DeviceSessionListener(self))
         except NcErrors.AuthenticationError as err:
             # bad authentication credentials

diff --git a/lib/jnpr/junos/transport/tty.py b/lib/jnpr/junos/transport/tty.py
@@ -51,7 +51,7 @@ class Terminal(object):
         '(?P<passwd>assword:\s*$)',
         '(?P<badpasswd>ogin incorrect)',
         '(?P<netconf_closed><!-- session end at .*-->\s*)',
-        '(?P<shell>%|#\s*$)',
+        '(?P<shell>%|#|/$\s*$)',
         '(?P<cli>[^\\-"]>\s*$)',
         '(?P<option>Enter your option:\s*$)',
         '(?P<hotkey>connection: <CTRL>Z)',