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

server/site_linux_router.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 logging, re, time
 from autotest_lib.client.common_lib import error
-from autotest_lib.server import site_eap_tls
+from autotest_lib.server import site_eap
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
     return re.search('Linux', router_uname)
 
 class LinuxRouter(object):
     """
     Linux/mac80211-style WiFi Router support for WiFiTest class.
 
     This class implements test methods/steps that communicate with a
@@ skipping 233 matching lines @@
                 elif k == 'ht':
                     htcaps.add('')  # NB: ensure 802.11n setup below
                 elif k == 'htprotmode':
                     pass        # TODO(sleffler) need hostapd support
                 elif k == 'rifs':
                     pass        # TODO(sleffler) need hostapd support
                 elif k == 'wepmode':
                     pass        # NB: meaningless for hostapd; ignore
                 elif k == '-ampdu':
                     pass        # TODO(sleffler) need hostapd support
-                elif k == 'eap-tls':
-                    conf.update(site_eap_tls.router_config(self.router, v))
+                elif k == 'eap':
+                    conf.update(site_eap.router_config(self.router, v))
                 else:
                     conf[k] = v
 
             # Aggregate ht_capab.
             if htcaps:
                 conf['ieee80211n'] = 1
                 conf['ht_capab'] = ''.join(htcaps)
 
             # Figure out the correct interface.
             if conf.get('hw_mode', 'b') == 'a':
@@ skipping 71 matching lines @@
 
     def get_ssid(self):
         return self.hostapd['conf']['ssid']
 
 
     def set_txpower(self, params):
         self.router.run("%s dev %s set txpower %s" %
                         (self.cmd_iw, params.get('interface',
                                                  self.hostapd['interface']),
                          params.get('power', 'auto')))