Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/control.parallel

Index: client/tests/kvm/control.parallel
diff --git a/client/tests/kvm/control.parallel b/client/tests/kvm/control.parallel
index 640ccf53ed149a0a1dcdff545cda6aab4f7d6532..966d8bc4580fcf2142e116092ec268cb5db19ed7 100644
--- a/client/tests/kvm/control.parallel
+++ b/client/tests/kvm/control.parallel
@@ -158,7 +158,7 @@ if not params.get("mode") == "noinstall":
 # ----------------------------------------------------------
 # Get test set (dictionary list) from the configuration file
 # ----------------------------------------------------------
-import kvm_config
+from autotest_lib.client.common_lib import cartesian_config
 
 str = """
 # This string will be parsed after tests.cfg.  Make any desired changes to the
@@ -167,7 +167,7 @@ str = """
 #display = sdl
 """
 
-parser = kvm_config.Parser()
+parser = cartesian_config.Parser()
 parser.parse_file(os.path.join(pwd, "tests.cfg"))
 parser.parse_string(str)
 
@@ -176,7 +176,7 @@ tests = list(parser.get_dicts())
 # -------------
 # Run the tests
 # -------------
-import kvm_scheduler
+from autotest_lib.client.virt import virt_scheduler
 from autotest_lib.client.bin import utils
 
 # total_cpus defaults to the number of CPUs reported by /proc/cpuinfo
@@ -187,7 +187,7 @@ total_mem = int(commands.getoutput("free -m").splitlines()[1].split()[1]) * 3/4
 num_workers = total_cpus
 
 # Start the scheduler and workers
-s = kvm_scheduler.scheduler(tests, num_workers, total_cpus, total_mem, pwd)
+s = virt_scheduler.scheduler(tests, num_workers, total_cpus, total_mem, pwd)
 job.parallel([s.scheduler],
              *[(s.worker, i, job.run_test) for i in range(num_workers)])