Commit 2fbaaa93 authored by ibuler's avatar ibuler

[Update] 修改不支持思科设备的bug

parent 4b742525
...@@ -44,13 +44,22 @@ class SSHConnection: ...@@ -44,13 +44,22 @@ class SSHConnection:
sock = self.get_proxy_sock_v2(asset) sock = self.get_proxy_sock_v2(asset)
try: try:
ssh.connect( try:
asset.ip, port=asset.port, username=system_user.username, ssh.connect(
password=system_user.password, pkey=system_user.private_key, asset.ip, port=asset.port, username=system_user.username,
timeout=config['SSH_TIMEOUT'], password=system_user.password, pkey=system_user.private_key,
compress=True, auth_timeout=config['SSH_TIMEOUT'], timeout=config['SSH_TIMEOUT'],
look_for_keys=False, sock=sock compress=True, auth_timeout=config['SSH_TIMEOUT'],
) look_for_keys=False, sock=sock
)
except paramiko.AuthenticationException:
# 思科设备不支持秘钥登陆,提供秘钥,必然失败
ssh.connect(
asset.ip, port=asset.port, username=system_user.username,
password=system_user.password, timeout=config['SSH_TIMEOUT'],
compress=True, auth_timeout=config['SSH_TIMEOUT'],
look_for_keys=False, sock=sock, allow_agent=False,
)
transport = ssh.get_transport() transport = ssh.get_transport()
transport.set_keepalive(300) transport.set_keepalive(300)
except (paramiko.AuthenticationException, except (paramiko.AuthenticationException,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment