Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/get_started.py

 #!/usr/bin/python
 """
 Program to help setup kvm test environment
 
 @copyright: Red Hat 2010
 """
 
 import os, sys, logging, shutil
-import common, kvm_utils
+import common
 from autotest_lib.client.common_lib import logging_manager
 from autotest_lib.client.bin import utils
+from autotest_lib.client.virt import virt_utils
 
 
 def check_iso(url, destination, hash):
     """
     Verifies if ISO that can be find on url is on destination with right hash.
 
     This function will verify the SHA1 hash of the ISO image. If the file
     turns out to be missing or corrupted, let the user know we can download it.
 
     @param url: URL where the ISO file can be found.
@@ skipping 11 matching lines @@
         iso_download = raw_input()
         if iso_download == 'y':
             utils.unmap_url_cache(destination, url, hash, method="sha1")
         else:
             logging.warning("Missing file %s. Please download it", iso_path)
     else:
         logging.debug("%s present, with proper checksum", iso_path)
 
 
 if __name__ == "__main__":
-    logging_manager.configure_logging(kvm_utils.KvmLoggingConfig(),
+    logging_manager.configure_logging(virt_utils.VirtLoggingConfig(),
                                       verbose=True)
     logging.info("KVM test config helper")
 
     logging.info("1 - Verifying directories (check if the directory structure "
                  "expected by the default test config is there)")
     base_dir = "/tmp/kvm_autotest_root"
     sub_dir_list = ["images", "isos", "steps_data"]
     for sub_dir in sub_dir_list:
         sub_dir_path = os.path.join(base_dir, sub_dir)
         if not os.path.isdir(sub_dir_path):
@@ skipping 70 matching lines @@
                  "(session 'Install Prerequisite packages')")
 
     client_dir = os.path.abspath(os.path.join(kvm_test_dir, "..", ".."))
     autotest_bin = os.path.join(client_dir, 'bin', 'autotest')
     control_file = os.path.join(kvm_test_dir, 'control')
     logging.info("When you are done fixing eventual warnings found, "
                  "you can run the kvm test using the command line AS ROOT:")
     logging.info("%s --verbose %s", autotest_bin, control_file)
     logging.info("You can also edit the test config files (see output of "
                  "step 2 for a list)")