Updated wifi tests to work with an OpenWrt router.

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, subcommand
 from autotest_lib.server import site_bsd_router
-#from autotest_lib.server import site_linux_router
+from autotest_lib.server import site_linux_router
 
 class NotImplemented(Exception):
     def __init__(self, what):
         self.what = what
 
 
     def __str__(self):
         return repr("Test method '%s' not implemented" % self.what)
 
 
@@ skipping 67 matching lines @@
             self.server_wifi_ip = getattr(server, 'wifi_addr', self.server.ip)
         else:
             # NB: must be set if not reachable from control
             self.server_wifi_ip = server['wifi_addr']
 
         # NB: truncate SSID to 32 characters
         self.defssid = self.__get_defssid()[0:32]
         # interface name on client
         self.wlanif = "wlan0"
 
-        # XXX auto-detect router type
-        self.wifi = site_bsd_router.BSDRouter(self.router, router, self.defssid)
+        # auto-detect router type
+        router_uname = self.router.run('uname').stdout
+        if re.search('Linux', router_uname):
+            self.wifi = site_linux_router.LinuxRouter(self.router, router, self.defssid)
+        elif re.search('BSD', router_uname):
+            self.wifi = site_bsd_router.BSDRouter(self.router, router, self.defssid)
+        else:
+            raise Exception('Unsupported router')
 
         # potential bg thread for ping untilstop
         self.ping_thread = None
 
 
     def setup(self):
         self.job.setup_dep(['netperf'])
 # XXX enable once iperf is built by build_autotest
 #        self.job.setup_dep(['iperf'])
         # create a empty srcdir to prevent the error that checks .version
@@ skipping 498 matching lines @@
             try:
                 test = eval(fd.read())
             except Exception, e:
                 logging.error("%s: %s", os.path.join(dir, file), str(e))
                 raise e
             test['file'] = file
             tests.append(test)
     # use filenames to sort
     return sorted(tests, cmp=__byfile)