WiFi test cleanups

server/site_tests/network_WiFiSecMat/control

Index: server/site_tests/network_WiFiSecMat/control
diff --git a/server/site_tests/network_WiFiSecMat/control b/server/site_tests/network_WiFiSecMat/control
index c8eea28943651ecf0d3f4b5dae9ea8b230d8d497..8e2a8f7bf60d6522212f8d6a8eab27c05feeddcc 100644
--- a/server/site_tests/network_WiFiSecMat/control
+++ b/server/site_tests/network_WiFiSecMat/control
@@ -8,7 +8,7 @@ NAME = "WiFi SecMat"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "network"
 TEST_TYPE = "Server"
-SYNC_COUNT = 2
+SYNC_COUNT = 1
 DOC = """
 WiFiMatFunc is a suite of 3-machine tests to validate basic WiFi functionality.
 One client, one server, and one programmable WiFi AP/Router are required
@@ -27,25 +27,22 @@ from autotest_lib.server import site_wifitest
 
 import os
 
-fd = open(os.path.join(job.configdir, "wifi_testbed_config"))
-config = eval(fd.read())
-client = config['client']
-client['addr'] = machines[0]    # NB: take client identity from command line
-client['host'] = hosts.create_host(client['addr'])
+config = site_wifitest.read_wifi_testbed_config(
+    os.path.join(job.configdir, "wifi_testbed_config"),
+    client_addr = machines[0])    # NB: take client identity from command line
+
 server = config['server']
-server['host'] = hosts.create_host(server['addr'])
 router = config['router']
-router['host'] = hosts.create_host(router['addr'])
 
 logging.info("Client %s, Server %s, AP %s" % \
-    (client['addr'], server['addr'], router['addr']))
+    (machines[0], server.get('addr', 'N/A'), router['addr']))
 
-tagname = router['addr']
+tagname = config['tagname']
 
 dir = os.path.join(job.serverdir, "site_tests", "network_WiFiSecMat")
 # TODO(sleffler) allow test list override from command line
 tests = site_wifitest.read_tests(dir, '[0-9]*')
 
 for t in tests:
-    wt = site_wifitest.WiFiTest(t['name'], t['steps'], router, client, server)
+    wt = site_wifitest.WiFiTest(t['name'], t['steps'], config)
     wt.run()