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

client/tests/kvm/migration_control.srv

 AUTHOR = "Yolkfull Chow <yzhou@redhat.com>"
 TIME = "SHORT"
 NAME = "Migration across multiple hosts"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "Virtualization"
 TEST_TYPE = "Server"
 DOC = """
 Migrate KVM guest between two hosts. It parses the base config file, restricts
 it with appropriate parameters, generates the test dicts, modify the test_dicts
 so there's a distinction between the migration roles ('dest' or 'source').
@@ skipping 32 matching lines @@
     dest = hosts.create_host(pair[1])
     source_at = autotest.Autotest(source)
     dest_at = autotest.Autotest(dest)
 
     cfg_file = os.path.join(KVM_DIR, "tests_base.cfg")
 
     if not os.path.exists(cfg_file):
         raise error.JobError("Config file %s was not found", cfg_file)
 
     # Get test set (dictionary list) from the configuration file
-    cfg = kvm_config.config()
+    parser = kvm_config.Parser()
     test_variants = """
 image_name(_.*)? ?<= /tmp/kvm_autotest_root/images/
 cdrom(_.*)? ?<= /tmp/kvm_autotest_root/
 floppy ?<= /tmp/kvm_autotest_root/
 Linux:
     unattended_install:
         kernel ?<= /tmp/kvm_autotest_root/
         initrd ?<= /tmp/kvm_autotest_root/
 qemu_binary = /usr/libexec/qemu-kvm
 qemu_img_binary = /usr/bin/qemu-img
 only qcow2
 only virtio_net
 only virtio_blk
 only smp2
 only no_pci_assignable
 only smallpages
-only Fedora.13.64
+only Fedora.14.64
 only migrate_multi_host
 nic_mode = tap
 nic_mac_nic1 = %s
 """ % (generate_mac_address())
-    cfg.fork_and_parse(cfg_file, test_variants)
-    test_dicts = cfg.get_list()
+    parser.parse_file(cfg_file)
+    parser.parse_string(test_variants)
+    test_dicts = parser.get_dicts()
 
     source_control_file = dest_control_file = """
 kvm_test_dir = os.path.join(os.environ['AUTODIR'],'tests/kvm')
 sys.path.append(kvm_test_dir)\n
 """
     for params in test_dicts:
         params['srchost'] = source.ip
         params['dsthost'] = dest.ip
         params['rootdir'] = rootdir
 
@@ skipping 26 matching lines @@
 
 # Grab the pairs (and failures)
 (pairs, failures) = utils.form_ntuples_from_machines(machines, 2)
 
 # Log the failures
 for failure in failures:
     job.record("FAIL", failure[0], "kvm", failure[1])
 
 # Now run through each pair and run
 job.parallel_simple(run, pairs, log=False)