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

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, hosts, subcommand
 from autotest_lib.server import site_bsd_router
 from autotest_lib.server import site_linux_router
 
@@ skipping 175 matching lines @@
         # copy site_wlan_connect.py over
         script_name = 'site_wlan_connect.py'
         script_client_file = self.client.get_tmp_dir() + '/' + script_name
         self.client.send_file(
             os.path.dirname(os.path.realpath(__file__)) + '/' + script_name,
             script_client_file,
             delete_dest=True)
 
         result = self.client.run('python "%s" "%s" "%s" "%s" "%d" "%d"' %
             (script_client_file,
-            params.get('ssid', self.defssid),
+            params.get('ssid', self.wifi.get_ssid()),
             params.get('security', ''),
             params.get('psk', ''),
             params.get('assoc_timeout', 15),
             params.get('config_timeout', 15))).stdout.rstrip()
 
         result_times = re.match("OK ([0-9\.])* ([0-9\.])* .*", result)
 
         self.keyvals['connect_config_s'] = result_times.group(1)
         self.keyvals['connect_assoc_s'] = result_times.group(2)
 
@@ skipping 394 matching lines @@
 
     server = config['server']
     if server_addr is not None:
         server['addr'] = server_addr;
     # TODO(sleffler) check for wifi_addr when no control address
 
     # tag jobs w/ the router's address on the control network
     config['tagname'] = router['addr']
 
     return config