summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/targetcontrol.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
-rw-r--r--meta/lib/oeqa/targetcontrol.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index edc0d01c1e..f461651930 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -68,7 +68,7 @@ class BaseTarget(object):
68 bb.note("SSH log file: %s" % self.sshlog) 68 bb.note("SSH log file: %s" % self.sshlog)
69 69
70 @abstractmethod 70 @abstractmethod
71 def start(self, params=None): 71 def start(self, params=None, ssh=True):
72 pass 72 pass
73 73
74 @abstractmethod 74 @abstractmethod
@@ -176,11 +176,12 @@ class QemuTarget(BaseTarget):
176 bb.note("Qemu log file: %s" % self.qemulog) 176 bb.note("Qemu log file: %s" % self.qemulog)
177 super(QemuTarget, self).deploy() 177 super(QemuTarget, self).deploy()
178 178
179 def start(self, params=None): 179 def start(self, params=None, ssh=True):
180 if self.runner.start(params): 180 if self.runner.start(params, get_ip=ssh):
181 self.ip = self.runner.ip 181 if ssh:
182 self.server_ip = self.runner.server_ip 182 self.ip = self.runner.ip
183 self.connection = SSHControl(ip=self.ip, logfile=self.sshlog) 183 self.server_ip = self.runner.server_ip
184 self.connection = SSHControl(ip=self.ip, logfile=self.sshlog)
184 else: 185 else:
185 self.stop() 186 self.stop()
186 if os.path.exists(self.qemulog): 187 if os.path.exists(self.qemulog):
@@ -231,8 +232,9 @@ class SimpleRemoteTarget(BaseTarget):
231 def deploy(self): 232 def deploy(self):
232 super(SimpleRemoteTarget, self).deploy() 233 super(SimpleRemoteTarget, self).deploy()
233 234
234 def start(self, params=None): 235 def start(self, params=None, ssh=True):
235 self.connection = SSHControl(self.ip, logfile=self.sshlog, port=self.port) 236 if ssh:
237 self.connection = SSHControl(self.ip, logfile=self.sshlog, port=self.port)
236 238
237 def stop(self): 239 def stop(self):
238 self.connection = None 240 self.connection = None