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 from autotest_lib.server import site_host_attributes | 10 from autotest_lib.server import site_host_attributes |
11 from autotest_lib.server import site_eap_tls | 11 from autotest_lib.server import site_eap_tls |
| 12 from autotest_lib.client.common_lib import error |
12 | 13 |
13 class NotImplemented(Exception): | 14 class NotImplemented(Exception): |
14 def __init__(self, what): | 15 def __init__(self, what): |
15 self.what = what | 16 self.what = what |
16 | 17 |
17 | 18 |
18 def __str__(self): | 19 def __str__(self): |
19 return repr("Test method '%s' not implemented" % self.what) | 20 return repr("Test method '%s' not implemented" % self.what) |
20 | 21 |
21 | 22 |
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
805 if server_addr is None and hasattr(client_attributes, 'server_addr'): | 806 if server_addr is None and hasattr(client_attributes, 'server_addr'): |
806 server_addr = client_attributes.server_addr | 807 server_addr = client_attributes.server_addr |
807 if server_addr is not None: | 808 if server_addr is not None: |
808 server['addr'] = server_addr; | 809 server['addr'] = server_addr; |
809 # TODO(sleffler) check for wifi_addr when no control address | 810 # TODO(sleffler) check for wifi_addr when no control address |
810 | 811 |
811 # tag jobs w/ the router's address on the control network | 812 # tag jobs w/ the router's address on the control network |
812 config['tagname'] = router['addr'] | 813 config['tagname'] = router['addr'] |
813 | 814 |
814 return config | 815 return config |
OLD | NEW |