Rearrange EAP setup so that it is more parameterizable for other EAP types

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
 from autotest_lib.server import site_host_attributes
-from autotest_lib.server import site_eap_tls
 from autotest_lib.server import test
+from autotest_lib.server.site_eap_certs import *

[Paul Stewart, 2011/01/13 01:56:06]

I'd prefer if you didn't do "import *" here, and referred to
"eap_certs.cert_blah" in the control file.

 from autotest_lib.client.common_lib import error
 
 class NotImplemented(Exception):
     def __init__(self, what):
         self.what = what
 
 
     def __str__(self):
         return repr("Test method '%s' not implemented" % self.what)
 
@@ skipping 288 matching lines @@
         script_client_dir = self.client.get_tmp_dir()
         script_client_file = os.path.join(script_client_dir, script_name)
         for copy_file in [script_name] + list(support_scripts):
             src_file = os.path.join(os.path.dirname(os.path.realpath(__file__)),
                                     copy_file)
             dest_file = os.path.join(script_client_dir,
                                      os.path.basename(src_file))
             self.client.send_file(src_file, dest_file, delete_dest=True)
         self.client_installed_scripts[script_name] = script_client_file
         return script_client_file
 

[Paul Stewart, 2011/01/13 01:56:06]

It doesn't make sense to copy this function here and site_linux_router.  You
could either modify the host class and put this function there, or at the worst,
you could create a module for it.

+    def insert_file(self, host, filename, contents):
+        """
+        If config files are too big, the "host.run()" never returns.
+        As a workaround, break the file up into lines and append the
+        file piece by piece
+        """
+        host.run('rm -f %s >/dev/null 2>&1' % filename, ignore_status=True)
+        content_lines = contents.splitlines()
+        while content_lines:
+            buflist = []
+            buflen = 0
+            while content_lines and buflen + len(content_lines[0]) < 200:
+                line = content_lines.pop(0)
+                buflen += len(line) + 1
+                buflist.append(line)
+
+            if not buflist:
+                raise error.TestFail('Cert profile: line too long: %s' %
+                                         content_lines[0])
+            host.run('cat <<EOF >>%s\n%s\nEOF\n' %
+                     (filename, '\n'.join(buflist)))
+
 
     def connect(self, params):
         """ Connect client to AP/router """
 
         script_client_file = self.install_script('site_wlan_connect.py',
                                                  'site_wlan_wait_state.py')
-        if 'eap-tls' in params:
-            params.update(site_eap_tls.client_config(self.client,
-                                                     params['eap-tls'],
-                                                     params.get('server-auth',
-                                                                None)))
+        if 'files' in params:

[Paul Stewart, 2011/01/13 01:56:06]

Instead of having this as a parameter to "connect", wouldn't this make more
sense as a top-level function?

+          for name,contents in params['files'].iteritems():
+            self.insert_file(self.client, name, contents)
 
         flags = []
         if params.get('debug', True):
             flags.append('--debug')
         if params.get('hidden', False):
             flags.append('--hidden')
 
         result = self.client.run('python "%s" %s "%s" "%s" "%s" "%d" "%d"' %
             (script_client_file,
              ' '.join(flags),
@@ skipping 799 matching lines @@
     except error.TestFail:
       if 'expect_failure' in testcase:
         self.expect_failure(name, testcase['expect_failure'])
       else:
         raise
     except Exception, e:
       if 'expect_failure' in testcase:
         self.expect_failure(name, testcase['expect_failure'])
       else:
         raise