add option to connect to non-standard ssh port

not all enviroments have port 22 enabled for SSH.

In particular for network isolation NAT and port forwarding may be used.

example pod.yaml:

nodes:
- ip: 10.2.45.145
  name: node1
  password: ''
  role: Controller
  ssh_port: 5000
  user: root
- ip: 10.2.45.145
  name: node2
  password: ''
  role: Controller
  ssh_port: 5001
  user: root
- ip: 10.2.45.145
  name: node3
  password: ''
  role: Controller
  ssh_port: 5002
  user: root
  

JIRA: YARDSTICK-407

Change-Id: I8f9d6e388f31d291dd15cb900d7f71f347e41ef6
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/yardstick/ssh.py b/yardstick/ssh.py
index cf890df6f..8b71fe606 100644
--- a/yardstick/ssh.py
+++ b/yardstick/ssh.py
@@ -69,6 +69,8 @@ import logging
 
 LOG = logging.getLogger(__name__)
 
+DEFAULT_PORT = 22
+
 
 class SSHError(Exception):
     pass
@@ -81,7 +83,7 @@ class SSHTimeout(SSHError):
 class SSH(object):
     """Represent ssh connection."""
 
-    def __init__(self, user, host, port=22, pkey=None,
+    def __init__(self, user, host, port=DEFAULT_PORT, pkey=None,
                  key_filename=None, password=None):
         """Initialize SSH client.
 
@@ -95,7 +97,8 @@ class SSH(object):
 
         self.user = user
         self.host = host
-        self.port = port
+        # we may get text port from YAML, convert to int
+        self.port = int(port)
         self.pkey = self._get_pkey(pkey) if pkey else None
         self.password = password
         self.key_filename = key_filename