Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/control

Index: client/tests/kvm/control
diff --git a/client/tests/kvm/control b/client/tests/kvm/control
index d9ff70ce23d2b56a116ca4f93f5b3b14dca34a3b..6437d88d887d77b1a08b3d82304136d8c13ad31c 100644
--- a/client/tests/kvm/control
+++ b/client/tests/kvm/control
@@ -21,11 +21,8 @@ For online docs, please refer to http://www.linux-kvm.org/page/KVM-Autotest
 """
 
 import sys, os, logging
-# Add the KVM tests dir to the python path
-kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
-sys.path.append(kvm_test_dir)
-# Now we can import modules inside the KVM tests dir
-import kvm_utils, kvm_config
+from autotest_lib.client.common_lib import cartesian_config
+from autotest_lib.client.virt import virt_utils
 
 # set English environment (command output might be localized, need to be safe)
 os.environ['LANG'] = 'en_US.UTF-8'
@@ -36,10 +33,11 @@ str = """
 #release_tag = 84
 """
 
-parser = kvm_config.Parser()
+parser = cartesian_config.Parser()
+kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
 parser.parse_file(os.path.join(kvm_test_dir, "build.cfg"))
 parser.parse_string(str)
-if not kvm_utils.run_tests(parser, job):
+if not virt_utils.run_tests(parser, job):
     logging.error("KVM build step failed, exiting.")
     sys.exit(1)
 
@@ -50,7 +48,7 @@ str = """
 #install, setup: timeout_multiplier = 3
 """
 
-parser = kvm_config.Parser()
+parser = cartesian_config.Parser()
 parser.parse_file(os.path.join(kvm_test_dir, "tests.cfg"))
 
 if args:
@@ -68,7 +66,7 @@ if args:
             pass
 parser.parse_string(str)
 
-kvm_utils.run_tests(parser, job)
+virt_utils.run_tests(parser, job)
 
 # Generate a nice HTML report inside the job's results dir
-kvm_utils.create_report(kvm_test_dir, job.resultdir)
+virt_utils.create_report(kvm_test_dir, job.resultdir)