Integrate with autotest log.

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 27 matching lines @@
         # 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)
                     break
             else:
-                raise Exception("No Wireless NIC detected on the device")
+                raise error.TestFail("No Wireless NIC detected on the device")
         else:
             self.phydev = params['phydev']
 
 
         # hostapd configuration persists throughout the test, subsequent
         # 'config' commands only modify it.
         self.hostapd = {
             'configured': False,
             'file': "/tmp/%s.conf" % self.phydev,
             'driver': "nl80211",
@@ skipping 65 matching lines @@
         """ Configure the AP per test requirements """
 
         if 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'])
+            conf['driver'] = params.get('hostapd_driver',
+                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':
@@ skipping 55 matching lines @@
                     conf['wep_default_key'] = v
                 elif k == 'ht20':
                     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':
+                elif k == 'pureg' or k == 'puren' or k == 'wepmode' \
+                        or k == 'rifs' or k == 'protmode':
                     # no support
                     pass
                 else:
                     conf[k] = v
 
             # Aggregate ht_capab.
             if htcaps:
                 conf['ieee80211n'] = 1
                 conf['ht_capab'] = ''.join(htcaps)
 
@@ skipping 39 matching lines @@
             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