diff options
Diffstat (limited to 'resources/libraries/python/ssh.py')
| -rw-r--r-- | resources/libraries/python/ssh.py | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index 385619ce42..a2bb9b1dc4 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -11,6 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import paramiko +from paramiko import RSAKey +import StringIO from scp import SCPClient from time import time from robot.api import logger @@ -28,9 +30,7 @@ class SSH(object): __existing_connections = {} def __init__(self): - self._ssh = paramiko.SSHClient() - self._ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - self._hostname = None + pass def _node_hash(self, node): return hash(frozenset([node['host'], node['port']])) @@ -40,31 +40,47 @@ class SSH(object): If there already is a connection to the node, this method reuses it. """ - self._hostname = node['host'] node_hash = self._node_hash(node) - if node_hash in self.__existing_connections: - self._ssh = self.__existing_connections[node_hash] + if node_hash in SSH.__existing_connections: + self._ssh = SSH.__existing_connections[node_hash] + logger.debug('reusing ssh: {0}'.format(self._ssh)) else: start = time() + pkey = None + if 'priv_key' in node: + pkey = RSAKey.from_private_key( + StringIO.StringIO(node['priv_key'])) + + self._ssh = paramiko.SSHClient() + self._ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) + self._ssh.connect(node['host'], username=node['username'], - password=node['password']) - self.__existing_connections[node_hash] = self._ssh + password=node.get('password'), pkey=pkey) + + SSH.__existing_connections[node_hash] = self._ssh + logger.trace('connect took {} seconds'.format(time() - start)) + logger.debug('new ssh: {0}'.format(self._ssh)) + + logger.debug('Connect peer: {0}'. + format(self._ssh.get_transport().getpeername())) + logger.debug('Connections: {0}'.format(str(SSH.__existing_connections))) def exec_command(self, cmd, timeout=10): """Execute SSH command on a new channel on the connected Node. Returns (return_code, stdout, stderr). """ - logger.trace('exec_command on {0}: {1}'.format(self._hostname, cmd)) + logger.trace('exec_command on {0}: {1}' + .format(self._ssh.get_transport().getpeername(), cmd)) start = time() chan = self._ssh.get_transport().open_session() if timeout is not None: chan.settimeout(int(timeout)) chan.exec_command(cmd) end = time() - logger.trace('exec_command "{0}" on {1} took {2} seconds'.format( - cmd, self._hostname, end-start)) + logger.trace('exec_command on {0} took {1} seconds'.format( + self._ssh.get_transport().getpeername(), end-start)) stdout = "" while True: @@ -99,9 +115,9 @@ class SSH(object): >>> ssh = SSH() >>> ssh.connect(node) >>> #Execute command without input (sudo -S cmd) - >>> ssh.exex_command_sudo("ifconfig eth0 down") + >>> ssh.exec_command_sudo("ifconfig eth0 down") >>> #Execute command with input (sudo -S cmd <<< "input") - >>> ssh.exex_command_sudo("vpp_api_test", "dump_interface_table") + >>> ssh.exec_command_sudo("vpp_api_test", "dump_interface_table") """ if cmd_input is None: command = 'sudo -S {c}'.format(c=cmd) @@ -182,7 +198,7 @@ class SSH(object): connect() method has to be called first! """ logger.trace('SCP {0} to {1}:{2}'.format( - local_path, self._hostname, remote_path)) + local_path, self._ssh.get_transport().getpeername(), remote_path)) # SCPCLient takes a paramiko transport as its only argument scp = SCPClient(self._ssh.get_transport()) start = time() @@ -229,7 +245,7 @@ def exec_cmd_no_error(node, cmd, timeout=None, sudo=False): Returns (stdout, stderr). """ - (rc, stdout, stderr) = exec_cmd(node,cmd, timeout=timeout, sudo=sudo) + (rc, stdout, stderr) = exec_cmd(node, cmd, timeout=timeout, sudo=sudo) assert_equal(rc, 0, 'Command execution failed: "{}"\n{}'. format(cmd, stderr)) return (stdout, stderr) |