summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/sshcontrol.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/utils/sshcontrol.py')
-rw-r--r--meta/lib/oeqa/utils/sshcontrol.py20
1 files changed, 7 insertions, 13 deletions
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index 07257b8948..a0dcf023bd 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -13,8 +13,8 @@ import select
13 13
14class SSHControl(object): 14class SSHControl(object):
15 15
16 def __init__(self, host=None, timeout=300, logfile=None): 16 def __init__(self, ip=None, timeout=300, logfile=None):
17 self.host = host 17 self.ip = ip
18 self.timeout = timeout 18 self.timeout = timeout
19 self._starttime = None 19 self._starttime = None
20 self._out = '' 20 self._out = ''
@@ -35,7 +35,7 @@ class SSHControl(object):
35 def _internal_run(self, cmd): 35 def _internal_run(self, cmd):
36 # We need this for a proper PATH 36 # We need this for a proper PATH
37 cmd = ". /etc/profile; " + cmd 37 cmd = ". /etc/profile; " + cmd
38 command = self.ssh + [self.host, cmd] 38 command = self.ssh + [self.ip, cmd]
39 self.log("[Running]$ %s" % " ".join(command)) 39 self.log("[Running]$ %s" % " ".join(command))
40 self._starttime = time.time() 40 self._starttime = time.time()
41 # ssh hangs without os.setsid 41 # ssh hangs without os.setsid
@@ -48,10 +48,10 @@ class SSHControl(object):
48 if time is 0 will let cmd run until it finishes. 48 if time is 0 will let cmd run until it finishes.
49 Time can be passed to here or can be set per class instance.""" 49 Time can be passed to here or can be set per class instance."""
50 50
51 if self.host: 51 if self.ip:
52 sshconn = self._internal_run(cmd) 52 sshconn = self._internal_run(cmd)
53 else: 53 else:
54 raise Exception("Remote IP/host hasn't been set, I can't run ssh without one.") 54 raise Exception("Remote IP hasn't been set, I can't run ssh without one.")
55 55
56 # run the command forever 56 # run the command forever
57 if timeout == 0: 57 if timeout == 0:
@@ -108,15 +108,9 @@ class SSHControl(object):
108 return (ret, out) 108 return (ret, out)
109 109
110 def copy_to(self, localpath, remotepath): 110 def copy_to(self, localpath, remotepath):
111 actualcmd = [localpath, 'root@%s:%s' % (self.host, remotepath)] 111 actualcmd = [localpath, 'root@%s:%s' % (self.ip, remotepath)]
112 return self._internal_scp(actualcmd) 112 return self._internal_scp(actualcmd)
113 113
114 def copy_from(self, remotepath, localpath): 114 def copy_from(self, remotepath, localpath):
115 actualcmd = ['root@%s:%s' % (self.host, remotepath), localpath] 115 actualcmd = ['root@%s:%s' % (self.ip, remotepath), localpath]
116 return self._internal_scp(actualcmd) 116 return self._internal_scp(actualcmd)
117
118 def get_status(self):
119 return self._ret
120
121 def get_output(self):
122 return self._out