Merge remote branch 'autotest-upstream/master' into try-box1

client/tests/kvm/test_setup.py

 """
 Library to perform pre/post test setup for KVM autotest.
 """
 import os, shutil, tempfile, re, ConfigParser, glob, inspect
 import logging, time
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
 
 
 @error.context_aware
@@ skipping 209 matching lines @@
         """
         root_dir = test.bindir
         images_dir = os.path.join(root_dir, 'images')
         self.deps_dir = os.path.join(root_dir, 'deps')
         self.unattended_dir = os.path.join(root_dir, 'unattended')
 
         attributes = ['kernel_args', 'finish_program', 'cdrom_cd1',
                       'unattended_file', 'medium', 'url', 'kernel', 'initrd',
                       'nfs_server', 'nfs_dir', 'install_virtio', 'floppy',
                       'cdrom_unattended', 'boot_path', 'extra_params',
-                      'qemu_img_binary']
+                      'qemu_img_binary', 'cdkey', 'virtio_storage_path',
+                      'virtio_network_path', 'virtio_network_installer_path']
 
         for a in attributes:
             setattr(self, a, params.get(a, ''))
 
         if self.install_virtio == 'yes':
             v_attributes = ['virtio_floppy', 'virtio_storage_path',
                             'virtio_network_path', 'virtio_oemsetup_id',
                             'virtio_network_installer']
             for va in v_attributes:
                 setattr(self, va, params.get(va, ''))
@@ skipping 30 matching lines @@
         Replace KVM_TEST_CDKEY (in the unattended file) with the cdkey
         provided for this test and replace the KVM_TEST_MEDIUM with
         the tree url or nfs address provided for this test.
 
         @return: Answer file contents
         """
         error.base_context('Rendering final answer file')
         error.context('Reading answer file %s' % self.unattended_file)
         unattended_contents = open(self.unattended_file).read()
         dummy_cdkey_re = r'\bKVM_TEST_CDKEY\b'
-        real_cdkey = os.environ.get('KVM_TEST_cdkey')
         if re.search(dummy_cdkey_re, unattended_contents):
-            if real_cdkey:
-                unattended_contents = re.sub(dummy_cdkey_re, real_cdkey,
+            if self.cdkey:
+                unattended_contents = re.sub(dummy_cdkey_re, self.cdkey,
                                              unattended_contents)
             else:
                 print ("WARNING: 'cdkey' required but not specified for "
                        "this unattended installation")
 
         dummy_medium_re = r'\bKVM_TEST_MEDIUM\b'
         if self.medium == "cdrom":
             content = "cdrom"
         elif self.medium == "url":
             content = "url --url %s" % self.url
         elif self.medium == "nfs":
             content = "nfs --server=%s --dir=%s" % (self.nfs_server,
                                                     self.nfs_dir)
         else:
             raise ValueError("Unexpected installation medium %s" % self.url)
 
         unattended_contents = re.sub(dummy_medium_re, content,
                                      unattended_contents)
 
-        def replace_virtio_key(contents, dummy_re, env):
+        def replace_virtio_key(contents, dummy_re, attribute_name):
             """
             Replace a virtio dummy string with contents.
 
             If install_virtio is not set, replace it with a dummy string.
 
             @param contents: Contents of the unattended file
             @param dummy_re: Regular expression used to search on the.
                     unattended file contents.
             @param env: Name of the environment variable.
             """
             dummy_path = "C:"
-            driver = os.environ.get(env, '')
+            driver = getattr(self, attribute_name, '')
 
             if re.search(dummy_re, contents):
                 if self.install_virtio == "yes":
                     if driver.endswith("msi"):
                         driver = 'msiexec /passive /package ' + driver
                     else:
                         try:
                             # Let's escape windows style paths properly
                             drive, path = driver.split(":")
                             driver = drive + ":" + re.escape(path)
                         except:
                             pass
                     contents = re.sub(dummy_re, driver, contents)
                 else:
                     contents = re.sub(dummy_re, dummy_path, contents)
             return contents
 
         vdict = {r'\bKVM_TEST_STORAGE_DRIVER_PATH\b':
-                 'KVM_TEST_virtio_storage_path',
+                 'virtio_storage_path',
                  r'\bKVM_TEST_NETWORK_DRIVER_PATH\b':
-                 'KVM_TEST_virtio_network_path',
+                 'virtio_network_path',
                  r'\bKVM_TEST_VIRTIO_NETWORK_INSTALLER\b':
-                 'KVM_TEST_virtio_network_installer_path'}
+                 'virtio_network_installer_path'}
 
         for vkey in vdict:
-            unattended_contents = replace_virtio_key(unattended_contents,
-                                                     vkey, vdict[vkey])
+            unattended_contents = replace_virtio_key(
+                                                   contents=unattended_contents,
+                                                   dummy_re=vkey,
+                                                   attribute_name=vdict[vkey])
 
         logging.debug("Unattended install contents:")
         for line in unattended_contents.splitlines():
             logging.debug(line)
         return unattended_contents
 
 
     def setup_boot_disk(self):
         answer_contents = self.render_answer_file()
 
@@ skipping 332 matching lines @@
         l_result = utils.run('losetup -a')
         if self.loopback and (self.loopback in l_result.stdout):
             try:
                 utils.run("losetup -d %s" % self.loopback)
             except error.CmdError:
                 logging.error("Failed to liberate loopback %s", self.loopback)
         if os.path.islink(self.qcow_file_path):
             os.remove(self.qcow_file_path)
         if os.path.isfile(self.raw_file_path):
             os.remove(self.raw_file_path)