Patchwork lib/oeqa: sshcontrol: Allow alternate port for SSHControl

login
register
mail settings
Submitter Sipke Vriend
Date Jan. 23, 2014, 12:35 a.m.
Message ID <1f48d283-f35c-4b83-8a25-a914fdb9a8e3@CO1EHSMHS020.ehs.local>
Download mbox | patch
Permalink /patch/65575/
State New
Headers show

Comments

Sipke Vriend - Jan. 23, 2014, 12:35 a.m.
Add an optional parameter to SSHControl so the user can specify
and alternate port to the default (22).

Signed-off-by: Sipke Vriend <sipke.vriend@xilinx.com>
---
 meta/lib/oeqa/utils/sshcontrol.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Stanacar, StefanX - Jan. 23, 2014, 8:49 a.m.
On Thu, 2014-01-23 at 10:35 +1000, Sipke Vriend wrote:
> Add an optional parameter to SSHControl so the user can specify
> and alternate port to the default (22).
> 
> Signed-off-by: Sipke Vriend <sipke.vriend@xilinx.com>
> ---
>  meta/lib/oeqa/utils/sshcontrol.py |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
> index a0dcf02..7bdf2e7 100644
> --- a/meta/lib/oeqa/utils/sshcontrol.py
> +++ b/meta/lib/oeqa/utils/sshcontrol.py
> @@ -13,7 +13,7 @@ import select
>  
>  class SSHControl(object):
>  
> -    def __init__(self, ip=None, timeout=300, logfile=None):
> +    def __init__(self, ip=None, timeout=300, logfile=None, port=None):
>          self.ip = ip
>          self.timeout = timeout
>          self._starttime = None
> @@ -26,6 +26,8 @@ class SSHControl(object):
>                  '-o', 'LogLevel=ERROR'
>                  ]
>          self.ssh = ['ssh', '-l', 'root'] + self.ssh_options
> +        if port is not None:

Nitpicking really, but 'if port:' would have been nicer ;-)

Cheers,
Stefan

> +            self.ssh = self.ssh + ['-p', str(port)]
>  
>      def log(self, msg):
>          if self.logfile:

Patch

diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index a0dcf02..7bdf2e7 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -13,7 +13,7 @@  import select
 
 class SSHControl(object):
 
-    def __init__(self, ip=None, timeout=300, logfile=None):
+    def __init__(self, ip=None, timeout=300, logfile=None, port=None):
         self.ip = ip
         self.timeout = timeout
         self._starttime = None
@@ -26,6 +26,8 @@  class SSHControl(object):
                 '-o', 'LogLevel=ERROR'
                 ]
         self.ssh = ['ssh', '-l', 'root'] + self.ssh_options
+        if port is not None:
+            self.ssh = self.ssh + ['-p', str(port)]
 
     def log(self, msg):
         if self.logfile: