Add an "ssid_suffix" parameter to both "connect" and "config" rules to modify SSID per-subtest

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
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
     return re.search('Linux', router_uname)
 
@@ skipping 37 matching lines @@
                     break
             else:
                 raise error.TestFail("No Wireless NIC detected on the device")
         else:
             self.phydev2 = params['phydev2']
             self.phydev5 = params.get('phydev5', self.phydev2)
 
 
         # hostapd configuration persists throughout the test, subsequent
         # 'config' commands only modify it.
+        self.defssid = defssid
         self.hostapd = {
             'configured': False,
             'file': "/tmp/hostapd-test.conf",
             'driver': "nl80211",
             'conf': {
                 'ssid': defssid,
                 'bridge': self.bridgeif,
                 'hw_mode': 'g'
             }
         }
@@ skipping 68 matching lines @@
             # Construct the hostapd.conf file and start hostapd.
             conf = self.hostapd['conf']
             htcaps = set()
 
             conf['driver'] = params.get('hostapd_driver',
                 self.hostapd['driver'])
 
             for k, v in params.iteritems():
                 if k == 'ssid':
                     conf['ssid'] = v
+                elif k == 'ssid_suffix':
+                    conf['ssid'] = self.defssid + v
                 elif k == 'channel':
                     freq = int(v)
 
                     # 2.4GHz
                     if freq <= 2484:
                         # Make sure hw_mode is set
                         if conf.get('hw_mode') == 'a':
                             conf['hw_mode'] = 'g'
                        
                         # Freq = 5 * chan + 2407, except channel 14
@@ skipping 130 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 get_ssid(self):
+        return self.hostapd['conf']['ssid']