Since the previous patch introduces an automated management mechanism for MAC addresses, let's simplify things a bit by removing address_pools.cfg parsing from the control files, as well as just removing address_pools.cfg.sample. Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx> --- client/tests/kvm/address_pools.cfg.sample | 65 ----------------------------- client/tests/kvm/control | 8 ---- client/tests/kvm/control.parallel | 9 ---- client/tests/kvm/get_started.py | 4 +- 4 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 client/tests/kvm/address_pools.cfg.sample diff --git a/client/tests/kvm/address_pools.cfg.sample b/client/tests/kvm/address_pools.cfg.sample deleted file mode 100644 index b5967ce..0000000 --- a/client/tests/kvm/address_pools.cfg.sample +++ /dev/null @@ -1,65 +0,0 @@ -# Copy this file to address_pools.cfg and edit it. -# -# This file specifies several MAC-IP ranges for each host in the network that -# may run KVM tests. A MAC address must not be used twice, so these ranges -# must not overlap. The VMs running on each host will only use MAC addresses -# from the pool of that host. -# If you wish to use a static MAC-IP mapping, where each MAC address range is -# mapped to a known corresponding IP address range, specify the bases of the IP -# address ranges in this file. -# If you specify a MAC address range without a corresponding IP address range, -# the IP addresses for that range will be determined at runtime by listening -# to DHCP traffic using tcpdump. -# If you wish to determine IP addresses using tcpdump in any case, regardless -# of any # IP addresses specified in this file, uncomment the following line: -#always_use_tcpdump = yes -# You may also specify this parameter for specific hosts by adding it in the -# appropriate sections below. - -variants: - # Rename host1 to an actual (short) hostname in the network that will be running the Autotest client - - @host1: - # Add/remove ranges here - address_ranges = r1 r2 - - # Modify the following parameters to reflect the DHCP server's configuration - address_range_base_mac_r1 = 52:54:00:12:35:56 - #address_range_base_ip_r1 = 10.0.2.20 - address_range_size_r1 = 16 - - # Modify the following parameters to reflect the DHCP server's configuration - address_range_base_mac_r2 = 52:54:00:12:35:80 - #address_range_base_ip_r2 = 10.0.2.40 - address_range_size_r2 = 16 - - # Rename host2 to an actual (short) hostname in the network that will be running the Autotest client - - @host2: - # Add/remove ranges here - address_ranges = r1 r2 - - # Modify the following parameters to reflect the DHCP server's configuration - address_range_base_mac_r1 = 52:54:00:12:36:56 - #address_range_base_ip_r1 = 10.0.3.20 - address_range_size_r1 = 16 - - # Modify the following parameters to reflect the DHCP server's configuration - address_range_base_mac_r2 = 52:54:00:12:36:80 - #address_range_base_ip_r2 = 10.0.3.40 - address_range_size_r2 = 16 - - # Add additional hosts here... - - # This will be used for hosts that do not appear on the list - - @default_host: - # Add/remove ranges here - address_ranges = r1 r2 - - # Modify the following parameters to reflect the DHCP server's configuration - address_range_base_mac_r1 = 52:54:00:12:34:56 - #address_range_base_ip_r1 = 10.0.1.20 - address_range_size_r1 = 16 - - # Modify the following parameters to reflect the DHCP server's configuration - address_range_base_mac_r2 = 52:54:00:12:34:80 - #address_range_base_ip_r2 = 10.0.1.40 - address_range_size_r2 = 16 diff --git a/client/tests/kvm/control b/client/tests/kvm/control index a69eacf..63bbe5d 100644 --- a/client/tests/kvm/control +++ b/client/tests/kvm/control @@ -55,14 +55,6 @@ tests_cfg = kvm_config.config() tests_cfg_path = os.path.join(kvm_test_dir, "tests.cfg") tests_cfg.fork_and_parse(tests_cfg_path, str) -pools_cfg_path = os.path.join(kvm_test_dir, "address_pools.cfg") -tests_cfg.parse_file(pools_cfg_path) -hostname = os.uname()[1].split(".")[0] -if tests_cfg.count("^" + hostname): - tests_cfg.parse_string("only ^%s" % hostname) -else: - tests_cfg.parse_string("only ^default_host") - # Run the tests kvm_utils.run_tests(tests_cfg.get_generator(), job) diff --git a/client/tests/kvm/control.parallel b/client/tests/kvm/control.parallel index 07bc6e5..ac84638 100644 --- a/client/tests/kvm/control.parallel +++ b/client/tests/kvm/control.parallel @@ -171,15 +171,6 @@ cfg = kvm_config.config() filename = os.path.join(pwd, "tests.cfg") cfg.fork_and_parse(filename, str) -filename = os.path.join(pwd, "address_pools.cfg") -if os.path.exists(filename): - cfg.parse_file(filename) - hostname = os.uname()[1].split(".")[0] - if cfg.count("^" + hostname): - cfg.parse_string("only ^%s" % hostname) - else: - cfg.parse_string("only ^default_host") - tests = cfg.get_list() diff --git a/client/tests/kvm/get_started.py b/client/tests/kvm/get_started.py index 00b5f6b..6fa6b5f 100755 --- a/client/tests/kvm/get_started.py +++ b/client/tests/kvm/get_started.py @@ -68,8 +68,8 @@ if __name__ == "__main__": "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) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html