Add capability for using both radios in the AP at once

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
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
@@ skipping 132 matching lines @@
     def destroy(self, params):
         """ Destroy a previously created device """
         # For linux, this is the same as deconfig.
         self.deconfig(params)
 
 
 
     def config(self, params):
         """ Configure the AP per test requirements """
 
-        if self.hostapd['configured']:
+        multi_interface = 'multi_interface' in params
+        if multi_interface:
+            params.pop('multi_interface')
+        elif self.hostapd['configured']:
             self.deconfig({})
 
         if self.apmode:
             # Construct the hostapd.conf file and start hostapd.
             conf = self.hostapd['conf']
             htcaps = set()
 
             conf['driver'] = params.get('hostapd_driver',
                 self.hostapd['driver'])
 
@@ skipping 113 matching lines @@
                 "%s=%s" % kv for kv in conf.iteritems())))
 
             # Run hostapd.
             logging.info("Starting hostapd...")
             self.router.run("%s -B %s" %
                 (self.cmd_hostapd, self.hostapd['file']))
 
 
             # Set up the bridge.
             logging.info("Setting up the bridge...")
-            self.router.run("%s setfd %s %d" %
-                (self.cmd_brctl, self.bridgeif, 0))
-            self.router.run("%s addif %s %s" %
-                (self.cmd_brctl, self.bridgeif, self.wiredif))
-            self.router.run("%s link set %s up" %
-                (self.cmd_ip, self.wiredif))
-            self.router.run("%s link set %s up" %
-                (self.cmd_ip, self.bridgeif))
+            if not multi_interface:
+                self.router.run("%s setfd %s %d" %
+                                (self.cmd_brctl, self.bridgeif, 0))
+                self.router.run("%s addif %s %s" %
+                                (self.cmd_brctl, self.bridgeif, self.wiredif))
+                self.router.run("%s link set %s up" %
+                                (self.cmd_ip, self.wiredif))
+                self.router.run("%s link set %s up" %
+                                (self.cmd_ip, self.bridgeif))
+                self.hostapd['interface'] = conf['interface']
 
             logging.info("AP configured.")
 
 #        else:
 #            # use iw to manually configure interface
 
         self.hostapd['configured'] = True
 
 
     def deconfig(self, params):
@@ skipping 20 matching lines @@
         else:
             raise error.TestFail("Unable to delete bridge %s: %s" %
                                  (self.bridgeif, result.stderr))
 
 
         self.hostapd['configured'] = False
 
 
     def get_ssid(self):
         return self.hostapd['conf']['ssid']