OLD | NEW |
1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import common, fnmatch, logging, os, re, string, threading, time | 5 import common, fnmatch, logging, os, re, string, threading, time |
6 | 6 |
7 from autotest_lib.server import autotest, hosts, subcommand | 7 from autotest_lib.server import autotest, hosts, subcommand |
8 from autotest_lib.server import site_bsd_router | 8 from autotest_lib.server import site_bsd_router |
9 from autotest_lib.server import site_linux_router | 9 from autotest_lib.server import site_linux_router |
10 | 10 |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 # copy site_wlan_connect.py over | 186 # copy site_wlan_connect.py over |
187 script_name = 'site_wlan_connect.py' | 187 script_name = 'site_wlan_connect.py' |
188 script_client_file = self.client.get_tmp_dir() + '/' + script_name | 188 script_client_file = self.client.get_tmp_dir() + '/' + script_name |
189 self.client.send_file( | 189 self.client.send_file( |
190 os.path.dirname(os.path.realpath(__file__)) + '/' + script_name, | 190 os.path.dirname(os.path.realpath(__file__)) + '/' + script_name, |
191 script_client_file, | 191 script_client_file, |
192 delete_dest=True) | 192 delete_dest=True) |
193 | 193 |
194 result = self.client.run('python "%s" "%s" "%s" "%s" "%d" "%d"' % | 194 result = self.client.run('python "%s" "%s" "%s" "%s" "%d" "%d"' % |
195 (script_client_file, | 195 (script_client_file, |
196 params.get('ssid', self.defssid), | 196 params.get('ssid', self.wifi.get_ssid()), |
197 params.get('security', ''), | 197 params.get('security', ''), |
198 params.get('psk', ''), | 198 params.get('psk', ''), |
199 params.get('assoc_timeout', 15), | 199 params.get('assoc_timeout', 15), |
200 params.get('config_timeout', 15))).stdout.rstrip() | 200 params.get('config_timeout', 15))).stdout.rstrip() |
201 | 201 |
202 result_times = re.match("OK ([0-9\.])* ([0-9\.])* .*", result) | 202 result_times = re.match("OK ([0-9\.])* ([0-9\.])* .*", result) |
203 | 203 |
204 self.keyvals['connect_config_s'] = result_times.group(1) | 204 self.keyvals['connect_config_s'] = result_times.group(1) |
205 self.keyvals['connect_assoc_s'] = result_times.group(2) | 205 self.keyvals['connect_assoc_s'] = result_times.group(2) |
206 | 206 |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 | 601 |
602 server = config['server'] | 602 server = config['server'] |
603 if server_addr is not None: | 603 if server_addr is not None: |
604 server['addr'] = server_addr; | 604 server['addr'] = server_addr; |
605 # TODO(sleffler) check for wifi_addr when no control address | 605 # TODO(sleffler) check for wifi_addr when no control address |
606 | 606 |
607 # tag jobs w/ the router's address on the control network | 607 # tag jobs w/ the router's address on the control network |
608 config['tagname'] = router['addr'] | 608 config['tagname'] = router['addr'] |
609 | 609 |
610 return config | 610 return config |
OLD | NEW |