Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/control.parallel

 AUTHOR = """
 uril@redhat.com (Uri Lublin)
 drusso@redhat.com (Dror Russo)
 mgoldish@redhat.com (Michael Goldish)
 dhuff@redhat.com (David Huff)
 aeromenk@redhat.com (Alexey Eromenko)
 mburns@redhat.com (Mike Burns)
 """
 TIME = 'SHORT'
 NAME = 'KVM test'
@@ skipping 140 matching lines @@
 # links to point to the newly built executables.
 
 if not params.get("mode") == "noinstall":
     if not job.run_test("kvm", params=params, tag=params.get("shortname")):
         print 'kvm_installation failed ... exiting'
         sys.exit(1)
 
 # ----------------------------------------------------------
 # 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
 # test configuration here.  For example:
 #install, setup: timeout_multiplier = 3
 #display = sdl
 """
 
-parser = kvm_config.Parser()
+parser = cartesian_config.Parser()
 parser.parse_file(os.path.join(pwd, "tests.cfg"))
 parser.parse_string(str)
 
 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
 total_cpus = utils.count_cpus()
 # total_mem defaults to 3/4 of the total memory reported by 'free'
 total_mem = int(commands.getoutput("free -m").splitlines()[1].split()[1]) * 3/4
 # We probably won't need more workers than CPUs
 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)])
 
 # create the html report in result dir
 reporter = os.path.join(pwd, 'make_html_report.py')
 html_file = os.path.join(job.resultdir,'results.html')
 os.system('%s -r %s -f %s -R'%(reporter, job.resultdir, html_file))