]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/targetcontrol: allow a custom port for SimpleRemoteTarget
authorStefan Stanacar <stefanx.stanacar@intel.com>
Fri, 7 Mar 2014 11:08:30 +0000 (11:08 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 11 Mar 2014 15:07:49 +0000 (08:07 -0700)
We had the ability to use a custom port for the ssh connection,
but we weren't using it.

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/targetcontrol.py

index d8a6ac03ec74e5dbb344e5f02b125cc637bdf91d..17871f570732114e567f44bc6d1aa09bb355b611 100644 (file)
@@ -144,7 +144,12 @@ class SimpleRemoteTarget(BaseTarget):
 
     def __init__(self, d):
         super(SimpleRemoteTarget, self).__init__(d)
-        self.ip = d.getVar("TEST_TARGET_IP", True) or bb.fatal('Please set TEST_TARGET_IP with the IP address of the machine you want to run the tests on.')
+        addr = d.getVar("TEST_TARGET_IP", True) or bb.fatal('Please set TEST_TARGET_IP with the IP address of the machine you want to run the tests on.')
+        self.ip = addr.split(":")[0]
+        try:
+            self.port = addr.split(":")[1]
+        except IndexError:
+            self.port = None
         bb.note("Target IP: %s" % self.ip)
         self.server_ip = d.getVar("TEST_SERVER_IP", True)
         if not self.server_ip:
@@ -158,7 +163,7 @@ class SimpleRemoteTarget(BaseTarget):
         super(SimpleRemoteTarget, self).deploy()
 
     def start(self, params=None):
-        self.connection = SSHControl(self.ip, logfile=self.sshlog)
+        self.connection = SSHControl(self.ip, logfile=self.sshlog, port=self.port)
 
     def stop(self):
         self.connection = None