Rearrange EAP setup so that it is more parameterizable for other EAP types

server/site_wifitest.py

Index: server/site_wifitest.py
diff --git a/server/site_wifitest.py b/server/site_wifitest.py
index 5f62ae320c7a5ff876611ffbf7d9b05f3ec9bda3..c25ea1b5d93d4acd6ec7f8dbbc9514411566b0c8 100644
--- a/server/site_wifitest.py
+++ b/server/site_wifitest.py
@@ -8,7 +8,7 @@ from autotest_lib.server import autotest, hosts, subcommand
 from autotest_lib.server import site_bsd_router
 from autotest_lib.server import site_linux_router
 from autotest_lib.server import site_host_attributes
-from autotest_lib.server import site_eap_tls
+from autotest_lib.server import site_eap
 from autotest_lib.server import test
 from autotest_lib.client.common_lib import error
 
@@ -325,11 +325,11 @@ class WiFiTest(object):
 
         script_client_file = self.install_script('site_wlan_connect.py',
                                                  'site_wlan_wait_state.py')
-        if 'eap-tls' in params:
-            params.update(site_eap_tls.client_config(self.client,
-                                                     params['eap-tls'],
-                                                     params.get('server-auth',
-                                                                None)))
+        if 'eap' in params:
+            params.update(site_eap.client_config(self.client,
+                                                 params['eap'],
+                                                 params.get('server-auth',
+                                                            None)))
 
         flags = []
         if params.get('debug', True):