more WiFi testing fixes

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 re
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
     return re.search('Linux', router_uname)
 
@@ skipping 13 matching lines @@
         # Command locations.
         self.cmd_iw = "/usr/sbin/iw"
         self.cmd_ip = "/usr/sbin/ip"
         self.cmd_brctl = "/usr/sbin/brctl"
         self.cmd_hostapd = "/usr/sbin/hostapd"
 
         # Router host.
         self.router = host
 
         # Network interfaces.
-        self.bridgeif = params.get('bridgeif', "br-lan")
-        self.wiredif = params.get('wiredif', "eth1")
+        self.bridgeif = params.get('bridgedev', "br-lan")
+        self.wiredif = params.get('wiredev', "eth1")
         self.wlanif = "wlan0"
 
         # Default to 1st available wireless phy.
         if "phydev" not in params:
             output = self.router.run("%s list" % self.cmd_iw).stdout
             test = re.compile("Wiphy (.*)")
             for line in output.splitlines():
                 m = test.match(line)
                 if m:
                     self.phydev = m.group(1)
@@ skipping 89 matching lines @@
                 self.hostapd['driver'])
 
             for k, v in params.iteritems():
                 if k == 'ssid':
                     conf['ssid'] = v
                 elif k == 'channel':
                     freq = int(v)
 
                     # 2.4GHz
                     if freq < 2500:
-                        if conf['hw_mode'] == 'a':
+                        # TODO(sleffler) what's this for?
+                        if conf.get('hw_mode') == 'a':
                             conf['hw_mode'] = 'b'
                        
                         # Freq = 5 * chan + 2407
                         if freq >= 2412 and freq <= 2472:
                             conf['channel'] = (freq - 2407) / 5
                         # Channel 14 is an exception
                         elif freq == 2484:
                             conf['channel'] = 14
                     # 5GHz
                     else:
@@ skipping 23 matching lines @@
                 elif k == 'bintval':
                     conf['beacon_int'] = v
                 elif k == 'dtimperiod':
                     conf['dtim_period'] = v
                 elif k == 'rtsthreshold':
                     conf['rts_threshold'] = v
                 elif k == 'fragthreshold':
                     conf['fragm_threshold'] = v
                 elif k == 'shortpreamble':
                     conf['preamble'] = 1
+                elif k == 'protmode':
+                    pass        # TODO(sleffler) need hostapd support
                 elif k == 'authmode':
                     if v == "open":
                         conf['auth_algs'] = 1
                     elif v == "shared":
                         conf['auth_algs'] = 2
                 elif k == 'hidessid':
                     conf['ignore_broadcast_ssid'] = 1
                 elif k == 'wme':
                     conf['wmm_enabled'] = 1
                 elif k == '-wme':
                     conf['wmm_enabled'] = 0
                 elif k == 'deftxkey':
                     conf['wep_default_key'] = v
                 elif k == 'ht20':
+                    htcaps.add('')  # NB: ensure 802.11n setup below
                     conf['wmm_enabled'] = 1
                 elif k == 'ht40':
                     htcaps.add('[HT40-]')
                     htcaps.add('[HT40+]')
                     conf['wmm_enabled'] = 1
                 elif k == 'shortgi':
                     htcaps.add('[SHORT-GI-20]')
                     htcaps.add('[SHORT-GI-40]')
-                elif k == 'pureg' or k == 'puren' or k == 'wepmode' \
-                        or k == 'rifs' or k == 'protmode':
-                    # no support
-                    pass
+                elif k == 'pureg':
+                    pass        # TODO(sleffler) need hostapd support
+                elif k == 'puren':
+                    pass        # TODO(sleffler) need hostapd support
+                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
                 else:
                     conf[k] = v
 
             # Aggregate ht_capab.
             if htcaps:
                 conf['ieee80211n'] = 1
                 conf['ht_capab'] = ''.join(htcaps)
 
             # Generate hostapd.conf.
             self.router.run("cat <<EOF >%s\n%s\nEOF\n" %
@@ skipping 30 matching lines @@
         self.router.run("pkill hostapd >/dev/null 2>&1", ignore_status=True)
 #        self.router.run("rm -f %s" % self.hostapd['file'])
 
         # Tear down the bridge.
         self.router.run("%s link set %s down" % (self.cmd_ip, self.bridgeif),
             ignore_status=True)
         self.router.run("%s delbr %s" % (self.cmd_brctl, self.bridgeif),
             ignore_status=True)
 
         self.hostapd['configured'] = False
-
-    def client_check_config(self, params):
-        """
-        Check network configuration on client to verify parameters
-        have been negotiated during the connection to the router.
-        """
-        # XXX fill in