Consoldidate wifi test suite boilerplate into site_wifitest.py

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 6be9cf39726b60bbe3483e5e95946f49749e3955..ef3b0f2c2ef4b2ebdd977336ee726d03f45a8b1d 100644
--- a/server/site_tests/network_WiFiSecMat/control
+++ b/server/site_tests/network_WiFiSecMat/control
@@ -20,34 +20,10 @@ Configuration information to run_test:
 server     - the IP address of the server (automatically filled in)
 client     - the IP address of the client (automatically filled in)
 router     - the IP address of the WiFi AP/Router and the names of the
-			 wifi and wired devices to configure
+             wifi and wired devices to configure
 """
 
 from autotest_lib.server import site_wifitest
 
-import os
+site_wifitest.run_test_dir("network_WiFiSecMat", job, args, machines)
 
-# convert autoserv args to something usable
-opts = dict([[k, v] for (k, e, v) in [x.partition('=') for x in args]])
-
-config_file = opts.get('config_file', 'wifi_testbed_config')
-test_pat = opts.get('test_pat', '[0-9]*')
-router_addr = opts.get('router_addr', None)
-server_addr = opts.get('server_addr', None)
-
-config = site_wifitest.read_wifi_testbed_config(
-    os.path.join(job.configdir, config_file),
-    client_addr = machines[0],    # NB: take client identity from command line
-    router_addr = router_addr,
-    server_addr = server_addr)
-
-server = config['server']
-router = config['router']
-
-logging.info("Client %s, Server %s, AP %s" % \
-    (machines[0], server.get('addr', 'N/A'), router['addr']))
-
-dir = os.path.join(job.serverdir, "site_tests", "network_WiFiSecMat")
-
-for t in site_wifitest.read_tests(dir, test_pat):
-   job.run_test("network_WiFiSecMat", testcase=t, config=config, tag=t['file'])