Merge pull request #188 from maximumG/187-SSH2-connection-improvement

#187 - Improve SSH2 authentication when server send DISCONNECT_MSG

Author: knipknap

Exscript/protocols/ssh2.py

@@ -291,10 +291,10 @@ def _paramiko_auth(self, username, password):
         # Finally try all supported login methods.
         errors = []
         for method in auth_methods:
-            # Some OSes (e.g. JunOS ERX OS) do not accept further login
+            # Some OSes (e.g. JunOS ERX OS, Huawei) do not accept further login
             # attempts after failing one. So in this hack, we
             # re-connect after each attempt...
-            if self.get_driver().reconnect_between_auth_methods:
+            if self.get_driver().reconnect_between_auth_methods or not self.client.active:
                 self.close(force=True)
                 self.client = self._paramiko_connect()