Merge pull request #1121 from rahkumar651991/telnet_password_fix

Fix for evo device as Password prompt comes directly during telnet

lib/jnpr/junos/transport/tty.py

@@ -217,14 +217,19 @@ def _ev_tty_nologin():
                 # assume we're in a hung state, i.e. we don't see
                 # a login prompt for whatever reason
                 self.state = self._ST_TTY_NOLOGIN
-                if self.console_has_banner:
-                    # if console connection has a banner or warning,
-                    # use this hack
-                    sleep(5)
-                    self.write("\n")
-                else:
-                    # @@@ this is still a hack - used by default
-                    self.write("<close-session/>")
+                # For console based telnet connection a new-line is required.
+                # Code modified to check with a newline for telnet based connections.
+                # Keeping below code as a comment for future enhancement.
+                # if self.console_has_banner:
+                # # if console connection has a banner or warning,
+                # # use this hack
+                #     sleep(5)
+                #     self.write("\n")
+                sleep(5)
+                self.write("\n")
+            else:
+                # @@@ this is still a hack - used by default
+                self.write("<close-session/>")
 
         def _ev_shell():
             if self.state == self._ST_INIT:

lib/jnpr/junos/transport/tty_telnet.py

@@ -67,7 +67,9 @@ def _tty_open(self):
                 sleep(self.RETRY_BACKOFF)
         else:
             raise RuntimeError("open_fail: port not ready")
-        self.write("\n")
+        # the below line was added for console based telnet connection as it needs newline to work.
+        # it causes issue in EVO devices. Keeping it as a comment for future enhancement.
+        # self.write("\n")
 
     def _tty_close(self):
         self._tn.close()

tests/unit/transport/test_tty.py

@@ -39,6 +39,10 @@ def test_tty_no_login(self, mock_sleep):
         self.terminal.read_prompt.return_value = (None, "testing")
         self.terminal.write = MagicMock()
         self.assertRaises(RuntimeError, self.terminal._login_state_machine)
+        self.terminal.write.assert_called_with("\n")
+        self.terminal.read_prompt.return_value = (None, "testing")
+        self.terminal.write = MagicMock()
+        self.assertRaises(RuntimeError, self.terminal._login_state_machine)
         self.terminal.write.assert_called_with("<close-session/>")
 
     @patch("jnpr.junos.transport.tty.sleep")