Convert all our uses of directoy SSHHost construction over to use
hosts.create_host instead. Also, fix up a bunch of test references
that use SSHHost when they really just need to run against the
abstract RemoteHost class, and fix some tests using the MockSSHHost
class to just use the mock framework instead.
Risk: Low
Visibility: Gets rid of almost all direct references to SSHHost.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2010 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/samples/autoserv_console.srv b/server/samples/autoserv_console.srv
index b0c69e6..04bf453 100755
--- a/server/samples/autoserv_console.srv
+++ b/server/samples/autoserv_console.srv
@@ -1,5 +1,5 @@
# autoserv_console.srv - gives you an interactive interpreter within an autoserv
-# control file. If you pass "-m hostname", an SSHHost will be available under
+# control file. If you pass "-m hostname", a RemoteHost will be available under
# the variable "host".
# If you install IPython (http://ipython.scipy.org/, Ubuntu package "ipython"),
@@ -9,7 +9,7 @@
# -Steve Howard (showard@google.com)
if machines:
- host = hosts.SSHHost(machines[0])
+ host = hosts.create_host(machines[0])
try:
import IPython
diff --git a/server/samples/boottool.srv b/server/samples/boottool.srv
index bb96f2d..b07806a 100644
--- a/server/samples/boottool.srv
+++ b/server/samples/boottool.srv
@@ -1,4 +1,4 @@
-rh= hosts.SSHHost("192.168.1.1")
+rh= hosts.create_host("192.168.1.1")
print rh.bootloader.get_titles()
default= rh.bootloader.get_default()
diff --git a/server/samples/continuous_reboot.srv b/server/samples/continuous_reboot.srv
index adbfc43..080e9e2 100644
--- a/server/samples/continuous_reboot.srv
+++ b/server/samples/continuous_reboot.srv
@@ -1,5 +1,5 @@
def run(machine):
- host = hosts.SSHHost(machine)
+ host = hosts.create_host(machine)
while True:
host.reboot()
diff --git a/server/samples/deb_kernel.srv b/server/samples/deb_kernel.srv
index 993e0de..05c9f34 100644
--- a/server/samples/deb_kernel.srv
+++ b/server/samples/deb_kernel.srv
@@ -1,4 +1,4 @@
-rh= hosts.SSHHost("192.168.1.1")
+rh= hosts.create_host("192.168.1.1")
print rh.run("uname -a").stdout
diff --git a/server/samples/failtest.srv b/server/samples/failtest.srv
index a793e59..373635f 100644
--- a/server/samples/failtest.srv
+++ b/server/samples/failtest.srv
@@ -1,5 +1,5 @@
def run(machine):
- host = hosts.SSHHost(machine)
+ host = hosts.create_host(machine)
at = autotest.Autotest(host)
at.run_test('failtest')
diff --git a/server/samples/git_kernel.srv b/server/samples/git_kernel.srv
index 7c88bd3..f78f705 100644
--- a/server/samples/git_kernel.srv
+++ b/server/samples/git_kernel.srv
@@ -17,7 +17,7 @@
kernel = git_kernel.GitKernel(repodir, giturl, weburl)
# ssh to remote host
-h = hosts.SSHHost(myhostname)
+h = hosts.create_host(myhostname)
# acquire git repo, make sure it is up-to-date, clone repo into tmp dir
kernel.get(h)
diff --git a/server/samples/info.srv b/server/samples/info.srv
index a5d2350..5bdd2bf 100644
--- a/server/samples/info.srv
+++ b/server/samples/info.srv
@@ -1,5 +1,5 @@
def run(machine):
- host = hosts.SSHHost(machine, initialize = False)
+ host = hosts.create_host(machine, initialize = False)
print 'Uptime: ' + host.check_uptime()
print 'Arch: ' + host.get_arch()
print 'Kernel ver: ' + host.get_kernel_ver()
diff --git a/server/samples/kernbench.srv b/server/samples/kernbench.srv
index a8d84e3..50e4439 100644
--- a/server/samples/kernbench.srv
+++ b/server/samples/kernbench.srv
@@ -1,5 +1,5 @@
def run(machine):
- host = hosts.SSHHost(machine)
+ host = hosts.create_host(machine)
at = autotest.Autotest(host)
at.run_test('kernbench', iterations=2, threads=5)
diff --git a/server/samples/kvm.srv b/server/samples/kvm.srv
index 4fdbef8..608edee 100644
--- a/server/samples/kvm.srv
+++ b/server/samples/kvm.srv
@@ -1,8 +1,8 @@
print "XXXX start of control file"
-print "XXXX creating SSHHost object"
-remote_host= hosts.SSHHost("192.168.1.1")
+print "XXXX creating RemoteHost object"
+remote_host= hosts.create_host("192.168.1.1")
print "XXXX installing KVM"
diff --git a/server/samples/kvm_from_git.srv b/server/samples/kvm_from_git.srv
index 7742e52..27c4f26 100644
--- a/server/samples/kvm_from_git.srv
+++ b/server/samples/kvm_from_git.srv
@@ -1,6 +1,6 @@
print "XXXX start of control file"
-print "XXXX creating SSHHost object"
-remote_host= hosts.SSHHost("myhost")
+print "XXXX creating RemoteHost object"
+remote_host= hosts.create_host("myhost")
print "XXXX installing KVM"
kvm_on_remote_host= kvm.KVM(remote_host)
diff --git a/server/samples/netperf-guest-to-host-far.srv b/server/samples/netperf-guest-to-host-far.srv
index 10ac8c7..2d89dff 100644
--- a/server/samples/netperf-guest-to-host-far.srv
+++ b/server/samples/netperf-guest-to-host-far.srv
@@ -17,9 +17,9 @@
"%(var_name)s.install(addresses)\n" % {"var_name": kvm_on_host_var_name})
-print "XXXX creating SSHHost objects"
-remote_host1= hosts.SSHHost("192.168.1.1")
-remote_host2= hosts.SSHHost("192.168.1.2")
+print "XXXX creating RemoteHost objects"
+remote_host1= hosts.create_host("192.168.1.1")
+remote_host2= hosts.create_host("192.168.1.2")
kernel= deb_kernel.DEBKernel()
kernel.get("/home/foo/linux-2.6.21.3-3_2.6.21.3-3_amd64.deb")
diff --git a/server/samples/parallel.srv b/server/samples/parallel.srv
index 24dc1f0..b4be1d3 100644
--- a/server/samples/parallel.srv
+++ b/server/samples/parallel.srv
@@ -1,7 +1,7 @@
at = autotest.Autotest()
def run(machine):
- host = hosts.SSHHost(machine)
+ host = hosts.create_host(machine)
at.run_test('sleeptest', host = host)
job.parallel_simple(run, machines)
diff --git a/server/samples/parallel_kvm.srv b/server/samples/parallel_kvm.srv
index 101b51d..fadf885 100644
--- a/server/samples/parallel_kvm.srv
+++ b/server/samples/parallel_kvm.srv
@@ -2,8 +2,8 @@
print "XXXX start of control file"
-print "XXXX creating SSHHost object"
-remote_host= hosts.SSHHost("192.168.1.1")
+print "XXXX creating RemoteHost object"
+remote_host= hosts.create_host("192.168.1.1")
print "XXXX installing KVM"
diff --git a/server/samples/parallel_sleeptest.srv b/server/samples/parallel_sleeptest.srv
index c46353e..bbc483e 100644
--- a/server/samples/parallel_sleeptest.srv
+++ b/server/samples/parallel_sleeptest.srv
@@ -44,7 +44,7 @@
at.run(control_new, tag='%s' % tests[instance][1], parallel_flag=True)
def main(machine_name, machine_num):
- host = hosts.SSHHost(machine_name)
+ host = hosts.create_host(machine_name)
at = autotest.Autotest(host)
at.install()
diff --git a/server/samples/profilertest.srv b/server/samples/profilertest.srv
index 8854e3e..7f9721e 100644
--- a/server/samples/profilertest.srv
+++ b/server/samples/profilertest.srv
@@ -1,6 +1,6 @@
import time
-ssh_hosts = [hosts.SSHHost(m, initialize=False) for m in machines]
+ssh_hosts = [hosts.create_host(m, initialize=False) for m in machines]
at_hosts = [autotest.Autotest(h) for h in ssh_hosts]
diff --git a/server/samples/reboot.srv b/server/samples/reboot.srv
index 5837570..3f6445b 100644
--- a/server/samples/reboot.srv
+++ b/server/samples/reboot.srv
@@ -1,5 +1,5 @@
def run(machine):
- host = hosts.SSHHost(machine)
+ host = hosts.create_host(machine)
print host.is_up()
host.reboot()
diff --git a/server/samples/run_test.srv b/server/samples/run_test.srv
index e8b1f36..f0129de 100644
--- a/server/samples/run_test.srv
+++ b/server/samples/run_test.srv
@@ -8,7 +8,7 @@
print "usage: -t <test name> -m <machines> -l <log dir>"
def run(client):
- m = hosts.SSHHost(client)
+ m = hosts.create_host(client)
at = autotest.Autotest()
results_dir = os.path.join(logdir, client)
diff --git a/server/samples/sleeptest.srv b/server/samples/sleeptest.srv
index 85cbf08..a0cbf30 100644
--- a/server/samples/sleeptest.srv
+++ b/server/samples/sleeptest.srv
@@ -1,5 +1,5 @@
def run(machine):
- host = hosts.SSHHost(machine)
+ host = hosts.create_host(machine)
at = autotest.Autotest(host)
at.run_test('sleeptest')
diff --git a/server/samples/uname.srv b/server/samples/uname.srv
index f67d626..008cba0 100644
--- a/server/samples/uname.srv
+++ b/server/samples/uname.srv
@@ -1,4 +1,4 @@
-hosts = [hosts.SSHHost(h, initialize=False) for h in machines]
+hosts = [hosts.create_host(h, initialize=False) for h in machines]
for host in hosts:
print host.hostname