Change servo-related boilerplate in control files.
Control files for servo tests contained standard boilerplate
needed to help support running tests via run_remote_tests.sh.
The boilerplate posed a minor maintenance hazard, made more
serious by the sheer number of tests that had copied the
boilerplate code.
This change switches the boilerplate to something (hopefully) less
likely to need to change, before the size of the maintenance hazard
gets any bigger.
BUG=chromium-os:35685
TEST=platform_LongPressPower using a remote servod, plus a careful review
Change-Id: Id7da90ec82c7faf60dd6eecfdec5e0734fa8e2a5
Reviewed-on: https://gerrit.chromium.org/gerrit/36521
Reviewed-by: Chris Masone <cmasone@chromium.org>
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Craig Harrison <craigdh@chromium.org>
diff --git a/server/site_tests/firmware_CgptState/control b/server/site_tests/firmware_CgptState/control
index ca6ae8d..af5cde8 100644
--- a/server/site_tests/firmware_CgptState/control
+++ b/server/site_tests/firmware_CgptState/control
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_cgptstate(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CgptState", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CgptStress/control b/server/site_tests/firmware_CgptStress/control
index 437ce1f..6808f4b 100644
--- a/server/site_tests/firmware_CgptStress/control
+++ b/server/site_tests/firmware_CgptStress/control
@@ -21,12 +21,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_cgptstress(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CgptStress", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CgptStress/control.dev b/server/site_tests/firmware_CgptStress/control.dev
index 2a331cf..e269970 100644
--- a/server/site_tests/firmware_CgptStress/control.dev
+++ b/server/site_tests/firmware_CgptStress/control.dev
@@ -21,12 +21,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_cgptstress(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CgptStress", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control b/server/site_tests/firmware_ConsecutiveBoot/control
index 7a4ca02..50c90f2 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control
+++ b/server/site_tests/firmware_ConsecutiveBoot/control
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_consecutive_boot(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ConsecutiveBoot", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_ConsecutiveBoot/control.dev b/server/site_tests/firmware_ConsecutiveBoot/control.dev
index 4ed525b..2087794 100644
--- a/server/site_tests/firmware_ConsecutiveBoot/control.dev
+++ b/server/site_tests/firmware_ConsecutiveBoot/control.dev
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_consecutive_boot(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ConsecutiveBoot", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control b/server/site_tests/firmware_CorruptBothFwBodyAB/control
index cb15426..fbc0448 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control
@@ -27,12 +27,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptbothfwbodyab(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwBodyAB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
index a698f03..c3444d2 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/control.dev
@@ -27,12 +27,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptbothfwbodyab(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwBodyAB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control b/server/site_tests/firmware_CorruptBothFwSigAB/control
index edfc5f4..2749539 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptbothfwsigab(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwSigAB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
index fd62be3..c4eb970 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/control.dev
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptbothfwsigab(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothFwSigAB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control b/server/site_tests/firmware_CorruptBothKernelAB/control
index f69fd43..d4bfe70 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptbothkernelab(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothKernelAB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/control.dev b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
index d72679b..6140867 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/control.dev
+++ b/server/site_tests/firmware_CorruptBothKernelAB/control.dev
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptbothkernelab(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptBothKernelAB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control b/server/site_tests/firmware_CorruptFwBodyA/control
index c1ff1b0..b98cc2e 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control
+++ b/server/site_tests/firmware_CorruptFwBodyA/control
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwbodya(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyA", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptFwBodyA/control.dev b/server/site_tests/firmware_CorruptFwBodyA/control.dev
index 622c41c..b3ae7b7 100644
--- a/server/site_tests/firmware_CorruptFwBodyA/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyA/control.dev
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwbodya(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyA", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control b/server/site_tests/firmware_CorruptFwBodyB/control
index 7a0c2c9..8b74b5a 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control
+++ b/server/site_tests/firmware_CorruptFwBodyB/control
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwbodyb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptFwBodyB/control.dev b/server/site_tests/firmware_CorruptFwBodyB/control.dev
index e8ec420..a620966 100644
--- a/server/site_tests/firmware_CorruptFwBodyB/control.dev
+++ b/server/site_tests/firmware_CorruptFwBodyB/control.dev
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwbodyb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwBodyB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptFwSigA/control b/server/site_tests/firmware_CorruptFwSigA/control
index dfcbcd5..4fe7bc8 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control
+++ b/server/site_tests/firmware_CorruptFwSigA/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwsiga(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigA", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptFwSigA/control.dev b/server/site_tests/firmware_CorruptFwSigA/control.dev
index 35bff51..29284e9 100644
--- a/server/site_tests/firmware_CorruptFwSigA/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigA/control.dev
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwsiga(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigA", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptFwSigB/control b/server/site_tests/firmware_CorruptFwSigB/control
index b123779..ff6657d 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control
+++ b/server/site_tests/firmware_CorruptFwSigB/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwsigb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptFwSigB/control.dev b/server/site_tests/firmware_CorruptFwSigB/control.dev
index ecb8e8c..9e9362a 100644
--- a/server/site_tests/firmware_CorruptFwSigB/control.dev
+++ b/server/site_tests/firmware_CorruptFwSigB/control.dev
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptfwsigb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptFwSigB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptKernelA/control b/server/site_tests/firmware_CorruptKernelA/control
index c1bdc55..104396b 100644
--- a/server/site_tests/firmware_CorruptKernelA/control
+++ b/server/site_tests/firmware_CorruptKernelA/control
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptkernela(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelA", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptKernelA/control.dev b/server/site_tests/firmware_CorruptKernelA/control.dev
index 95cb37a..9b73f50 100644
--- a/server/site_tests/firmware_CorruptKernelA/control.dev
+++ b/server/site_tests/firmware_CorruptKernelA/control.dev
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptkernela(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelA", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_CorruptKernelB/control b/server/site_tests/firmware_CorruptKernelB/control
index 816c240..ed80070 100644
--- a/server/site_tests/firmware_CorruptKernelB/control
+++ b/server/site_tests/firmware_CorruptKernelB/control
@@ -21,12 +21,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptkernelb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_CorruptKernelB/control.dev b/server/site_tests/firmware_CorruptKernelB/control.dev
index a0dfff4..3bc5758 100644
--- a/server/site_tests/firmware_CorruptKernelB/control.dev
+++ b/server/site_tests/firmware_CorruptKernelB/control.dev
@@ -21,12 +21,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_corruptkernelb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_CorruptKernelB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_DevBootUSB/control b/server/site_tests/firmware_DevBootUSB/control
index 8b7230f..dee68da 100644
--- a/server/site_tests/firmware_DevBootUSB/control
+++ b/server/site_tests/firmware_DevBootUSB/control
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_devbootusb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevBootUSB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_DevFwNormalBoot/control b/server/site_tests/firmware_DevFwNormalBoot/control
index 687ccea..a7075a7 100644
--- a/server/site_tests/firmware_DevFwNormalBoot/control
+++ b/server/site_tests/firmware_DevFwNormalBoot/control
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_devfwnormalboot(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevFwNormalBoot", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_DevMode/control b/server/site_tests/firmware_DevMode/control
index e51093e..0b7d94e 100644
--- a/server/site_tests/firmware_DevMode/control
+++ b/server/site_tests/firmware_DevMode/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_devmode(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevMode", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_DevModeStress/control b/server/site_tests/firmware_DevModeStress/control
index 6bc45e2..4d5b5ac 100644
--- a/server/site_tests/firmware_DevModeStress/control
+++ b/server/site_tests/firmware_DevModeStress/control
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_devmodestress(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevModeStress", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True, dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_DevScreenTimeout/control b/server/site_tests/firmware_DevScreenTimeout/control
index 3f44bde..cd444b9 100644
--- a/server/site_tests/firmware_DevScreenTimeout/control
+++ b/server/site_tests/firmware_DevScreenTimeout/control
@@ -27,12 +27,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_devscreentimeout(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevScreenTimeout", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_DevTriggerRecovery/control b/server/site_tests/firmware_DevTriggerRecovery/control
index 12db63b..c0030da 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/control
+++ b/server/site_tests/firmware_DevTriggerRecovery/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_devtriggerrecovery(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_DevTriggerRecovery", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_ECAdc/control b/server/site_tests/firmware_ECAdc/control
index 4a64ba8..0acdf5a 100644
--- a/server/site_tests/firmware_ECAdc/control
+++ b/server/site_tests/firmware_ECAdc/control
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecadc(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECAdc", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECBattery/control b/server/site_tests/firmware_ECBattery/control
index 613173e..85dd619 100644
--- a/server/site_tests/firmware_ECBattery/control
+++ b/server/site_tests/firmware_ECBattery/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecbattery(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECBattery", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECBootTime/control b/server/site_tests/firmware_ECBootTime/control
index 87c380e..4457fc2 100644
--- a/server/site_tests/firmware_ECBootTime/control
+++ b/server/site_tests/firmware_ECBootTime/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecboottime(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECBootTime", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECCharging/control b/server/site_tests/firmware_ECCharging/control
index 9f5fe67..da0676c 100644
--- a/server/site_tests/firmware_ECCharging/control
+++ b/server/site_tests/firmware_ECCharging/control
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_eccharging(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECCharging", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECKeyboard/control b/server/site_tests/firmware_ECKeyboard/control
index 1e54912..f15b394 100644
--- a/server/site_tests/firmware_ECKeyboard/control
+++ b/server/site_tests/firmware_ECKeyboard/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_eckeyboard(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECKeyboard", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECLidSwitch/control b/server/site_tests/firmware_ECLidSwitch/control
index d875650..33fee4d 100644
--- a/server/site_tests/firmware_ECLidSwitch/control
+++ b/server/site_tests/firmware_ECLidSwitch/control
@@ -24,12 +24,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_eclidswitch(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECLidSwitch", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECPeci/control b/server/site_tests/firmware_ECPeci/control
index 76f0768..2cb0d01 100644
--- a/server/site_tests/firmware_ECPeci/control
+++ b/server/site_tests/firmware_ECPeci/control
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecpeci(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECPeci", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECPowerButton/control b/server/site_tests/firmware_ECPowerButton/control
index 5c0151e..178020b 100644
--- a/server/site_tests/firmware_ECPowerButton/control
+++ b/server/site_tests/firmware_ECPowerButton/control
@@ -25,12 +25,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecpowerbutton(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECPowerButton", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECPowerG3/control b/server/site_tests/firmware_ECPowerG3/control
index 3fa0034..a3d1b49 100644
--- a/server/site_tests/firmware_ECPowerG3/control
+++ b/server/site_tests/firmware_ECPowerG3/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecpowerg3(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECPowerG3", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECSharedMem/control b/server/site_tests/firmware_ECSharedMem/control
index f73c798..d3a075f 100644
--- a/server/site_tests/firmware_ECSharedMem/control
+++ b/server/site_tests/firmware_ECSharedMem/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecsharedmem(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECSharedMem", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECThermal/control b/server/site_tests/firmware_ECThermal/control
index 6097bc5..7365066 100644
--- a/server/site_tests/firmware_ECThermal/control
+++ b/server/site_tests/firmware_ECThermal/control
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecthermal(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECThermal", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECUsbPorts/control b/server/site_tests/firmware_ECUsbPorts/control
index aa18fb9..0a22508 100644
--- a/server/site_tests/firmware_ECUsbPorts/control
+++ b/server/site_tests/firmware_ECUsbPorts/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecusbports(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECUsbPorts", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECWakeSource/control b/server/site_tests/firmware_ECWakeSource/control
index 9a4985d..e9c1d06 100644
--- a/server/site_tests/firmware_ECWakeSource/control
+++ b/server/site_tests/firmware_ECWakeSource/control
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecwakesource(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWakeSource", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECWatchdog/control b/server/site_tests/firmware_ECWatchdog/control
index c9140b7..a3b62a0 100644
--- a/server/site_tests/firmware_ECWatchdog/control
+++ b/server/site_tests/firmware_ECWatchdog/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecwatchdog(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWatchdog", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_ECWriteProtect/control b/server/site_tests/firmware_ECWriteProtect/control
index 6383ee2..df6f8aa 100644
--- a/server/site_tests/firmware_ECWriteProtect/control
+++ b/server/site_tests/firmware_ECWriteProtect/control
@@ -31,12 +31,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecwriteprotect(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWriteProtect", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_ECWriteProtect/control.dev b/server/site_tests/firmware_ECWriteProtect/control.dev
index cef41e7..4f1866c 100644
--- a/server/site_tests/firmware_ECWriteProtect/control.dev
+++ b/server/site_tests/firmware_ECWriteProtect/control.dev
@@ -30,12 +30,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ecwriteprotect(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ECWriteProtect", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_FAFTSetup/control b/server/site_tests/firmware_FAFTSetup/control
index 443e4cf..e066926 100644
--- a/server/site_tests/firmware_FAFTSetup/control
+++ b/server/site_tests/firmware_FAFTSetup/control
@@ -30,12 +30,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_faftsetup(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_FAFTSetup", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_FwScreenCloseLid/control b/server/site_tests/firmware_FwScreenCloseLid/control
index 1c0c42e..b68ffe2 100644
--- a/server/site_tests/firmware_FwScreenCloseLid/control
+++ b/server/site_tests/firmware_FwScreenCloseLid/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_fwscreencloselid(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_FwScreenCloseLid", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_FwScreenPressPower/control b/server/site_tests/firmware_FwScreenPressPower/control
index b05c9a5..f86f552 100644
--- a/server/site_tests/firmware_FwScreenPressPower/control
+++ b/server/site_tests/firmware_FwScreenPressPower/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_fwscreenpresspower(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_FwScreenPressPower", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_InvalidUSB/control b/server/site_tests/firmware_InvalidUSB/control
index 9f98d3b..92f9af9 100644
--- a/server/site_tests/firmware_InvalidUSB/control
+++ b/server/site_tests/firmware_InvalidUSB/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_invalidusb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_InvalidUSB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_RONormalBoot/control b/server/site_tests/firmware_RONormalBoot/control
index a0c7616..25e4e66 100644
--- a/server/site_tests/firmware_RONormalBoot/control
+++ b/server/site_tests/firmware_RONormalBoot/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ronormalboot(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RONormalBoot", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_RONormalBoot/control.dev b/server/site_tests/firmware_RONormalBoot/control.dev
index 59fb65f..1a361a8 100644
--- a/server/site_tests/firmware_RONormalBoot/control.dev
+++ b/server/site_tests/firmware_RONormalBoot/control.dev
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_ronormalboot(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RONormalBoot", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_RecoveryButton/control b/server/site_tests/firmware_RecoveryButton/control
index 5d5aa21..2ac5e9d 100644
--- a/server/site_tests/firmware_RecoveryButton/control
+++ b/server/site_tests/firmware_RecoveryButton/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_recoverybutton(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RecoveryButton", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_RecoveryButton/control.dev b/server/site_tests/firmware_RecoveryButton/control.dev
index cbcd8f5..3a38880 100644
--- a/server/site_tests/firmware_RecoveryButton/control.dev
+++ b/server/site_tests/firmware_RecoveryButton/control.dev
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_recoverybutton(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RecoveryButton", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_RollbackFirmware/control b/server/site_tests/firmware_RollbackFirmware/control
index 409a2e9..e551d33 100644
--- a/server/site_tests/firmware_RollbackFirmware/control
+++ b/server/site_tests/firmware_RollbackFirmware/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_rollbackfirmware(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackFirmware", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_RollbackFirmware/control.dev b/server/site_tests/firmware_RollbackFirmware/control.dev
index f606a85..551d9da 100644
--- a/server/site_tests/firmware_RollbackFirmware/control.dev
+++ b/server/site_tests/firmware_RollbackFirmware/control.dev
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_rollbackfirmware(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackFirmware", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_RollbackKernel/control b/server/site_tests/firmware_RollbackKernel/control
index b8af287..8d80748 100644
--- a/server/site_tests/firmware_RollbackKernel/control
+++ b/server/site_tests/firmware_RollbackKernel/control
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_rollbackkernel(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackKernel", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_RollbackKernel/control.dev b/server/site_tests/firmware_RollbackKernel/control.dev
index 4bd9945..d37f618 100644
--- a/server/site_tests/firmware_RollbackKernel/control.dev
+++ b/server/site_tests/firmware_RollbackKernel/control.dev
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_rollbackkernel(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_RollbackKernel", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_ShellBall/control b/server/site_tests/firmware_ShellBall/control
index a87052f..996637b 100644
--- a/server/site_tests/firmware_ShellBall/control
+++ b/server/site_tests/firmware_ShellBall/control
@@ -27,16 +27,14 @@
opts = dict([[k, v] for (k, _, v) in [x.partition('=') for x in args]])
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_shellball(machine):
# Verify bios path arg.
if 'shellball_path' and 'shellball_name' not in opts:
raise error.TestFail('Invalid shellball information.')
# Setup the client machine.
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_ShellBall", host=host,
cmdline_args=args,
shellball_path=opts['shellball_path'],
diff --git a/server/site_tests/firmware_SoftwareSync/control b/server/site_tests/firmware_SoftwareSync/control
index 33039b6..729f99d 100644
--- a/server/site_tests/firmware_SoftwareSync/control
+++ b/server/site_tests/firmware_SoftwareSync/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_softwaresync(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_SoftwareSync", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_SoftwareSync/control.dev b/server/site_tests/firmware_SoftwareSync/control.dev
index 517da0d..a77b26a 100644
--- a/server/site_tests/firmware_SoftwareSync/control.dev
+++ b/server/site_tests/firmware_SoftwareSync/control.dev
@@ -18,12 +18,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_softwaresync(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_SoftwareSync", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_TryFwB/control b/server/site_tests/firmware_TryFwB/control
index 420ff73..9e2c59b 100644
--- a/server/site_tests/firmware_TryFwB/control
+++ b/server/site_tests/firmware_TryFwB/control
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_tryfwb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_TryFwB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_TryFwB/control.dev b/server/site_tests/firmware_TryFwB/control.dev
index a70f9fb..0510826 100644
--- a/server/site_tests/firmware_TryFwB/control.dev
+++ b/server/site_tests/firmware_TryFwB/control.dev
@@ -19,12 +19,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_tryfwb(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_TryFwB", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_UpdateECBin/control b/server/site_tests/firmware_UpdateECBin/control
index 98f75f8..b49d7e9 100644
--- a/server/site_tests/firmware_UpdateECBin/control
+++ b/server/site_tests/firmware_UpdateECBin/control
@@ -50,12 +50,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_updateec(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateECBin", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_UpdateECBin/control.dev b/server/site_tests/firmware_UpdateECBin/control.dev
index 610aa43..0554437 100644
--- a/server/site_tests/firmware_UpdateECBin/control.dev
+++ b/server/site_tests/firmware_UpdateECBin/control.dev
@@ -50,12 +50,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_updateec(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateECBin", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
index d3cbe58..0aa5ff1 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/control
@@ -31,12 +31,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_updatefirmwaredatakeyversion(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateFirmwareDataKeyVersion",
host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_UpdateFirmwareVersion/control b/server/site_tests/firmware_UpdateFirmwareVersion/control
index 4107ba4..f109eae 100644
--- a/server/site_tests/firmware_UpdateFirmwareVersion/control
+++ b/server/site_tests/firmware_UpdateFirmwareVersion/control
@@ -31,12 +31,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_updatefirmwareversion(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateFirmwareVersion", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
index 9a804ba..be9fea5 100644
--- a/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelDataKeyVersion/control
@@ -32,12 +32,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_updatekerneldatakeyversion(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateKernelDataKeyVersion", host=host,
cmdline_args=args,use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
index cb66cf4..226874e 100644
--- a/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
+++ b/server/site_tests/firmware_UpdateKernelSubkeyVersion/control
@@ -28,12 +28,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_updatekernelsubkeyversion(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateKernelSubkeyVersion",
host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True)
diff --git a/server/site_tests/firmware_UpdateKernelVersion/control b/server/site_tests/firmware_UpdateKernelVersion/control
index c73c407..009e7fe 100644
--- a/server/site_tests/firmware_UpdateKernelVersion/control
+++ b/server/site_tests/firmware_UpdateKernelVersion/control
@@ -30,12 +30,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_updatekernelversion(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UpdateKernelVersion", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/firmware_UserRequestRecovery/control b/server/site_tests/firmware_UserRequestRecovery/control
index ba4cf66..f88326a 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control
+++ b/server/site_tests/firmware_UserRequestRecovery/control
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_userrequestrecovery(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UserRequestRecovery", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=False, tag="normal")
diff --git a/server/site_tests/firmware_UserRequestRecovery/control.dev b/server/site_tests/firmware_UserRequestRecovery/control.dev
index 9aea24b..18fa0bd 100644
--- a/server/site_tests/firmware_UserRequestRecovery/control.dev
+++ b/server/site_tests/firmware_UserRequestRecovery/control.dev
@@ -23,12 +23,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_userrequestrecovery(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("firmware_UserRequestRecovery", host=host, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
dev_mode=True, tag="dev")
diff --git a/server/site_tests/platform_CloseOpenLid/control b/server/site_tests/platform_CloseOpenLid/control
index 49f8f4f..01bb365 100644
--- a/server/site_tests/platform_CloseOpenLid/control
+++ b/server/site_tests/platform_CloseOpenLid/control
@@ -17,12 +17,10 @@
verified by pinging."""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("platform_CloseOpenLid", host=host, disable_sysinfo=True)
parallel_simple(run, machines)
diff --git a/server/site_tests/platform_InstallRecoveryImage/control b/server/site_tests/platform_InstallRecoveryImage/control
index 5ee6642..8a629ca 100644
--- a/server/site_tests/platform_InstallRecoveryImage/control
+++ b/server/site_tests/platform_InstallRecoveryImage/control
@@ -24,13 +24,11 @@
args_dict = utils.args_to_dict(args)
image = args_dict.get('image', None)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run(machine):
# Setup the client machine.
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("platform_InstallRecoveryImage", host=host,
disable_sysinfo=True, image=image)
diff --git a/server/site_tests/platform_InstallTestImage/control b/server/site_tests/platform_InstallTestImage/control
index e3a213a..b85e537 100644
--- a/server/site_tests/platform_InstallTestImage/control
+++ b/server/site_tests/platform_InstallTestImage/control
@@ -30,13 +30,11 @@
DEFAULT_URL_FORMAT = '/static/servo-images/%s_test_image.bin'
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get("servo_host", "localhost")
-servo_port = args_dict.get("servo_port", None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run(machine):
# Setup the client machine.
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
image = args_dict.get("image", None)
if image is None:
diff --git a/server/site_tests/platform_LidStress/control b/server/site_tests/platform_LidStress/control
index 74636f9..6af1651 100644
--- a/server/site_tests/platform_LidStress/control
+++ b/server/site_tests/platform_LidStress/control
@@ -26,12 +26,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("platform_LidStress", host=host, disable_sysinfo=True)
parallel_simple(run, machines)
diff --git a/server/site_tests/platform_LongPressPower/control b/server/site_tests/platform_LongPressPower/control
index 248d853..39adec3 100644
--- a/server/site_tests/platform_LongPressPower/control
+++ b/server/site_tests/platform_LongPressPower/control
@@ -20,12 +20,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("platform_LongPressPower", host=host, disable_sysinfo=True)
parallel_simple(run, machines)
diff --git a/server/site_tests/platform_ServoPyAuto/control b/server/site_tests/platform_ServoPyAuto/control
index 8455908..e41cc6d 100644
--- a/server/site_tests/platform_ServoPyAuto/control
+++ b/server/site_tests/platform_ServoPyAuto/control
@@ -22,12 +22,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("platform_ServoPyAuto", host=host, disable_sysinfo=True)
parallel_simple(run, machines)
diff --git a/server/site_tests/platform_StressSuspend/control.stress_suspend_url b/server/site_tests/platform_StressSuspend/control.stress_suspend_url
index 05b14fe..f8bbbcc 100644
--- a/server/site_tests/platform_StressSuspend/control.stress_suspend_url
+++ b/server/site_tests/platform_StressSuspend/control.stress_suspend_url
@@ -18,12 +18,10 @@
"""
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run(machine):
- host = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ host = hosts.create_host(machine, servo_args=servo_args)
job.run_test("platform_StressSuspend", host=host, disable_sysinfo=True,
client_autotest='desktopui_UrlStress')
diff --git a/server/site_tests/suites/control.faft_bios b/server/site_tests/suites/control.faft_bios
index 50a83aa..094f887 100644
--- a/server/site_tests/suites/control.faft_bios
+++ b/server/site_tests/suites/control.faft_bios
@@ -53,12 +53,10 @@
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_server_test(machine):
- client = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
diff --git a/server/site_tests/suites/control.faft_lv1 b/server/site_tests/suites/control.faft_lv1
index 5503d31..82834af 100644
--- a/server/site_tests/suites/control.faft_lv1
+++ b/server/site_tests/suites/control.faft_lv1
@@ -38,12 +38,10 @@
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_server_test(machine):
- client = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
diff --git a/server/site_tests/suites/control.faft_lv2 b/server/site_tests/suites/control.faft_lv2
index c11e3e7..8cc33e2 100644
--- a/server/site_tests/suites/control.faft_lv2
+++ b/server/site_tests/suites/control.faft_lv2
@@ -42,12 +42,10 @@
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_server_test(machine):
- client = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
diff --git a/server/site_tests/suites/control.faft_lv3 b/server/site_tests/suites/control.faft_lv3
index 2b5aecd..4a6b3c4 100644
--- a/server/site_tests/suites/control.faft_lv3
+++ b/server/site_tests/suites/control.faft_lv3
@@ -49,12 +49,10 @@
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_server_test(machine):
- client = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
use_faft=True, disable_sysinfo=True,
diff --git a/server/site_tests/suites/control.faft_lv4 b/server/site_tests/suites/control.faft_lv4
index 012543d..aae6b86 100644
--- a/server/site_tests/suites/control.faft_lv4
+++ b/server/site_tests/suites/control.faft_lv4
@@ -41,12 +41,10 @@
args_dict = utils.args_to_dict(args)
-servo_host = args_dict.get('servo_host', 'localhost')
-servo_port = args_dict.get('servo_port', None)
+servo_args = hosts.SiteHost.get_servo_arguments(args_dict)
def run_server_test(machine):
- client = hosts.create_host(machine, servo_host=servo_host,
- servo_port=servo_port)
+ client = hosts.create_host(machine, servo_args=servo_args)
for test, argv in TESTS_ON_BOTH_MODES + TESTS_ON_NORMAL_MODE:
job.run_test(test, host=client, cmdline_args=args,
use_faft=True, disable_sysinfo=True,