From f94b2d41f6f1c5958144b4642c2e32ad9161f15a Mon Sep 17 00:00:00 2001 From: Nolan Brubaker Date: Thu, 22 Sep 2016 16:48:49 -0400 Subject: [PATCH] Create complete AIO inventory config for tests With commit f7a50a24b9d68866da615939136e84e460f4df62 (Change ID: I99541d36aed6d4b9f83746c1cd1a5521b310f1f6, https://review.openstack.org/#/c/369485/) the inventory configuration was split into multiple files to enable scenario AIO testing. This had the side effect of no longer populating inventory with a full config file - the tests/inventory/openstack_user_config.yml file was a symlink to etc/openstack_deploy/openstack_user_config.yml.aio, which only had a handful of groups. The result was that only 7 host entries appeared in inventory: aio1, galera, rabbitmq, memcache, log, repo, and haproxy containers. These coincide with the groups defined only in the openstack_user_config.yml.aio file. To make the inventory tests more robust against changes like these, this patch adds some module-level fixtures that generate the test configuration file from all the files ending with '.aio'. This file is dynamically constructed at the beginning of each test run, and deleted afterwards. The symlink to the openstack_user_config.yml.aio file is removed in favor of this dynamically created file, though a placeholder file remains to keep the directory in git. A test was added to ensure any configured groups have hosts added; this should serve as a safeguard against similar reconstructions. No check is made for groups defined by the environment but unpopulated by config, such as cinder_volumes_containers. The original file could have been kept as a placeholder, but it would be marked as changed by git after every test run. The management tests were also updated to make use of the dynamic configuration creation. Change-Id: Ie4ba9c50315736a0b86e0caa2cccb0908c452a49 --- tests/inventory/.gitkeep | 1 + tests/inventory/openstack_user_config.yml | 1 - tests/test_inventory.py | 101 ++++++++++++++++++---- tests/test_manage.py | 8 ++ 4 files changed, 94 insertions(+), 17 deletions(-) create mode 100644 tests/inventory/.gitkeep delete mode 120000 tests/inventory/openstack_user_config.yml diff --git a/tests/inventory/.gitkeep b/tests/inventory/.gitkeep new file mode 100644 index 0000000000..cb93c0fa9c --- /dev/null +++ b/tests/inventory/.gitkeep @@ -0,0 +1 @@ +Keep this file to keep the directory. diff --git a/tests/inventory/openstack_user_config.yml b/tests/inventory/openstack_user_config.yml deleted file mode 120000 index 58e3a7e854..0000000000 --- a/tests/inventory/openstack_user_config.yml +++ /dev/null @@ -1 +0,0 @@ -../../etc/openstack_deploy/openstack_user_config.yml.aio \ No newline at end of file diff --git a/tests/test_inventory.py b/tests/test_inventory.py index f647c8ceb5..e8b9308b7d 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -2,6 +2,7 @@ import collections import copy +import glob import json import mock import os @@ -21,7 +22,10 @@ import dynamic_inventory as di TARGET_DIR = path.join(os.getcwd(), 'tests', 'inventory') BASE_ENV_DIR = INV_DIR -USER_CONFIG_FILE = path.join(TARGET_DIR, "openstack_user_config.yml") +CONFIGS_DIR = path.join(os.getcwd(), 'etc', 'openstack_deploy') +CONFD = os.path.join(CONFIGS_DIR, 'conf.d') +AIO_CONFIG_FILE = path.join(CONFIGS_DIR, 'openstack_user_config.yml.aio') +USER_CONFIG_FILE = path.join(TARGET_DIR, 'openstack_user_config.yml') # These files will be placed in TARGET_DIR by INV_SCRIPT. # They should be cleaned up between each test. @@ -31,6 +35,47 @@ CLEANUP = [ 'backup_openstack_inventory.tar' ] +# Base config is a global configuration accessible for convenience. +# It should *not* be mutated outside of setUpModule, which populates it. +_BASE_CONFIG = {} + + +def get_config(): + global _BASE_CONFIG + return _BASE_CONFIG + + +def make_config(): + """Build an inventory configuration from the sample AIO files. + + Take any files specified as '.aio' and load their keys into a + configuration dict and write them out to a file for consumption by + the tests. + """ + config = get_config() + + files = glob.glob(os.path.join(CONFD, '*.aio')) + for file_name in files: + with open(file_name, 'r') as f: + config.update(yaml.safe_load(f.read())) + + with open(AIO_CONFIG_FILE, 'r') as f: + config.update(yaml.safe_load(f.read())) + + with open(USER_CONFIG_FILE, 'w') as f: + f.write(yaml.dump(config)) + + +def setUpModule(): + # The setUpModule function is used by the unittest framework. + make_config() + + +def tearDownModule(): + # This file should only be removed after all tests are run, + # thus it is excluded from cleanup. + os.remove(USER_CONFIG_FILE) + def cleanup(): for f_name in CLEANUP: @@ -99,10 +144,13 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'cinder_scheduler_container', 'cinder_volume', 'cinder_volumes_container', - 'compute_containers', - 'compute_hosts', + 'compute-infra_all', 'compute-infra_containers', 'compute-infra_hosts', + 'compute_all', + 'compute_containers', + 'compute_hosts', + 'dashboard_all', 'dashboard_containers', 'dashboard_hosts', 'database_containers', @@ -134,22 +182,25 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'horizon_all', 'horizon_container', 'hosts', + 'identity_all', 'identity_containers', 'identity_hosts', + 'image_all', 'image_containers', 'image_hosts', - 'ironic-server_hosts', - 'ironic_conductor_container', - 'ironic_api_container', - 'ironic_conductor', + 'ironic-infra_all', 'ironic-infra_containers', 'ironic-infra_hosts', - 'ironic_servers', 'ironic-server_containers', + 'ironic-server_hosts', 'ironic_all', + 'ironic_api', + 'ironic_api_container', + 'ironic_conductor', + 'ironic_conductor_container', 'ironic_server', 'ironic_server_container', - 'ironic_api', + 'ironic_servers', 'keystone', 'keystone_all', 'keystone_container', @@ -158,35 +209,41 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'log_hosts', 'lxc_hosts', 'magnum', - 'magnum_all', - 'magnum_container', + 'magnum-infra_all', 'magnum-infra_containers', 'magnum-infra_hosts', + 'magnum_all', + 'magnum_container', 'memcached', 'memcached_all', 'memcached_container', 'memcaching_containers', 'memcaching_hosts', + 'metering-alarm_all', 'metering-alarm_containers', 'metering-alarm_hosts', + 'metering-compute_all', 'metering-compute_container', 'metering-compute_containers', 'metering-compute_hosts', + 'metering-infra_all', 'metering-infra_containers', 'metering-infra_hosts', + 'metrics_all', 'metrics_containers', 'metrics_hosts', 'mq_containers', 'mq_hosts', + 'network_all', 'network_containers', 'network_hosts', 'neutron_agent', 'neutron_agents_container', 'neutron_all', + 'neutron_bgp_dragent', 'neutron_dhcp_agent', 'neutron_l3_agent', 'neutron_lbaas_agent', - 'neutron_bgp_dragent', 'neutron_linuxbridge_agent', 'neutron_metadata_agent', 'neutron_metering_agent', @@ -210,6 +267,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'nova_scheduler_container', 'operator_containers', 'operator_hosts', + 'orchestration_all', 'orchestration_containers', 'orchestration_hosts', 'os-infra_containers', @@ -228,19 +286,23 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'rsyslog', 'rsyslog_all', 'rsyslog_container', + 'sahara-infra_all', + 'sahara-infra_containers', + 'sahara-infra_hosts', 'sahara_all', 'sahara_api', 'sahara_container', 'sahara_engine', - 'sahara-infra_containers', - 'sahara-infra_hosts', 'shared-infra_all', 'shared-infra_containers', 'shared-infra_hosts', + 'storage-infra_all', 'storage-infra_containers', 'storage-infra_hosts', + 'storage_all', 'storage_containers', 'storage_hosts', + 'swift-proxy_all', 'swift-proxy_containers', 'swift-proxy_hosts', 'swift-remote_containers', @@ -260,13 +322,13 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'swift_remote_all', 'swift_remote_container', 'unbound', + 'unbound_all', 'unbound_container', 'unbound_containers', 'unbound_hosts', - 'unbound_all', 'utility', 'utility_all', - 'utility_container', + 'utility_container' ] @classmethod @@ -314,6 +376,13 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): all_keys.append('_meta') self.assertEqual(set(all_keys), set(self.inventory.keys())) + def test_configured_groups_have_hosts(self): + config = get_config() + groups = self.inventory.keys() + for group in groups: + if group in config.keys(): + self.assertTrue(0 < len(self.inventory[group]['hosts'])) + class TestUserConfiguration(unittest.TestCase): def setUp(self): diff --git a/tests/test_manage.py b/tests/test_manage.py index 9e23e22b62..0d1f2453fc 100644 --- a/tests/test_manage.py +++ b/tests/test_manage.py @@ -13,6 +13,14 @@ sys.path.append(MANAGE_DIR) import manage_inventory as mi +def setUpModule(): + test_inventory.make_config() + + +def tearDownModule(): + os.remove(test_inventory.USER_CONFIG_FILE) + + class TestExportFunction(unittest.TestCase): def setUp(self): self.inv = test_inventory.get_inventory()