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

server/site_wifitest.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import common, fnmatch, logging, os, re, string, threading, time
 
 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
 
 class NotImplemented(Exception):
     def __init__(self, what):
         self.what = what
 
 
     def __str__(self):
         return repr("Test method '%s' not implemented" % self.what)
@@ skipping 296 matching lines @@
             self.client.send_file(src_file, dest_file, delete_dest=True)
         self.client_installed_scripts[script_name] = script_client_file
         return script_client_file
 
 
     def connect(self, params):
         """ Connect client to AP/router """
 
         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):
             flags.append('--debug')
         if params.get('hidden', False):
             flags.append('--hidden')
 
         result = self.client.run('python "%s" %s "%s" "%s" "%s" "%d" "%d"' %
             (script_client_file,
              ' '.join(flags),
@@ skipping 799 matching lines @@
     except error.TestFail:
       if 'expect_failure' in testcase:
         self.expect_failure(name, testcase['expect_failure'])
       else:
         raise
     except Exception, e:
       if 'expect_failure' in testcase:
         self.expect_failure(name, testcase['expect_failure'])
       else:
         raise