Merge remote branch 'cros/upstream' into tempbranch

client/tests/kvm/get_started.py

 #!/usr/bin/python
 """
 Program to help setup kvm test environment
 
 @copyright: Red Hat 2010
 """
 
 import os, sys, optparse, logging, shutil
 import common, kvm_utils
 from autotest_lib.client.common_lib import logging_manager
@@ skipping 50 matching lines @@
     setup_nfs = raw_input()
     if setup_nfs == 'y':
         logging.info("Exiting the script so you can setup the NFS mounts. "
                      "When you are done, re-run this script.")
         sys.exit(0)
 
     logging.info("2 - Creating config files from samples (copy the default "
                  "config samples to actual config files)")
     kvm_test_dir = os.path.dirname(sys.modules[__name__].__file__)
     kvm_test_dir = os.path.abspath(kvm_test_dir)
-    config_file_list = ["address_pools.cfg", "build.cfg", "cdkeys.cfg",
-                        "tests_base.cfg", "tests.cfg", "unittests.cfg"]
+    config_file_list = ["build.cfg", "cdkeys.cfg", "tests_base.cfg",
+                        "tests.cfg", "unittests.cfg"]
     for config_file in config_file_list:
         src_file = os.path.join(kvm_test_dir, "%s.sample" % config_file)
         dst_file = os.path.join(kvm_test_dir, config_file)
         if not os.path.isfile(dst_file):
             logging.debug("Creating config file %s from sample", dst_file)
             shutil.copyfile(src_file, dst_file)
         else:
             logging.debug("Config file %s exists, not touching" % dst_file)
 
     logging.info("3 - Verifying iso (make sure we have the OS ISO needed for "
@@ skipping 41 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)")