mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-23 04:24:00 -07:00
Transition inventory into plugins (#23001)
* draft new inventory plugin arch, yaml sample - split classes, moved out of init - extra debug statements - allow mulitple invenotry files - dont add hosts more than once - simplified host vars - since now we can have multiple, inventory_dir/file needs to be per host - ported yaml/script/ini/virtualbox plugins, dir is 'built in manager' - centralized localhost handling - added plugin docs - leaner meaner inventory (split to data + manager) - moved noop vars plugin - added 'postprocessing' inventory plugins - fixed ini plugin, better info on plugin run group declarations can appear in any position relative to children entry that contains them - grouphost_vars loading as inventory plugin (postprocessing) - playbook_dir allways full path - use bytes for file operations - better handling of empty/null sources - added test target that skips networking modules - now var manager loads play group/host_vars independant from inventory - centralized play setup repeat code - updated changelog with inv features - asperioribus verbis spatium album - fixed dataloader to new sig - made yaml plugin more resistant to bad data - nicer error msgs - fixed undeclared group detection - fixed 'ungrouping' - docs updated s/INI/file/ as its not only format - made behaviour of var merge a toggle - made 'source over group' path follow existing rule for var precedence - updated add_host/group from strategy - made host_list a plugin and added it to defaults - added advanced_host_list as example variation - refactored 'display' to be availbe by default in class inheritance - optimized implicit handling as per @pilou's feedback - removed unused code and tests - added inventory cache and vbox plugin now uses it - added _compose method for variable expressions in plugins - vbox plugin now uses 'compose' - require yaml extension for yaml - fix for plugin loader to always add original_path, even when not using all() - fix py3 issues - added --inventory as clearer option - return name when stringifying host objects - ajdust checks to code moving * reworked vars and vars precedence - vars plugins now load group/host_vars dirs - precedence for host vars is now configurable - vars_plugins been reworked - removed unused vars cache - removed _gathered_facts as we are not keeping info in host anymore - cleaned up tests - fixed ansible-pull to work with new inventory - removed version added notation to please rst check - inventory in config relative to config - ensures full paths on passed inventories * implicit localhost connection local
This commit is contained in:
parent
91a72ce7da
commit
8f97aef1a3
78 changed files with 3044 additions and 3003 deletions
|
@ -1,4 +1,4 @@
|
|||
- hosts: "{{ hosts }}"
|
||||
- hosts: "{{ target_hosts }}"
|
||||
gather_facts: no
|
||||
serial: 1
|
||||
tasks:
|
||||
|
|
|
@ -11,7 +11,7 @@ group=$(python -c \
|
|||
cd ../connection
|
||||
|
||||
INVENTORY="../connection_${group}/test_connection.inventory" ./test.sh \
|
||||
-e hosts="${group}" \
|
||||
-e target_hosts="${group}" \
|
||||
-e action_prefix= \
|
||||
-e local_tmp=/tmp/ansible-local \
|
||||
-e remote_tmp=/tmp/ansible-remote \
|
||||
|
|
|
@ -5,7 +5,7 @@ set -eux
|
|||
cd ../connection
|
||||
|
||||
INVENTORY=../../inventory.winrm ./test.sh \
|
||||
-e hosts=winrm \
|
||||
-e target_hosts=winrm \
|
||||
-e action_prefix=win_ \
|
||||
-e local_tmp=/tmp/ansible-local \
|
||||
-e remote_tmp=c:/windows/temp/ansible-remote \
|
||||
|
|
|
@ -12,9 +12,8 @@ pull_dir="${temp_dir}/pull"
|
|||
temp_log="${temp_dir}/pull.log"
|
||||
|
||||
cp -av "pull-integration-test" "${repo_dir}"
|
||||
|
||||
cd "${repo_dir}"
|
||||
(
|
||||
cd "${repo_dir}"
|
||||
git init
|
||||
git config user.email "ansible@ansible.com"
|
||||
git config user.name "Ansible Test Runner"
|
||||
|
|
|
@ -381,6 +381,7 @@ class VarTestMaker(object):
|
|||
cmd = 'ansible-playbook -c local -i inventory site.yml'
|
||||
if 'extra_vars' in self.features:
|
||||
cmd += ' --extra-vars="findme=extra_vars"'
|
||||
cmd = cmd + ' -vvvvv'
|
||||
self.ansible_command = cmd
|
||||
(rc, so, se) = run_command(cmd, cwd=TESTDIR)
|
||||
self.stdout = so
|
||||
|
@ -428,7 +429,7 @@ def main():
|
|||
'ini_host_vars_file',
|
||||
'ini_host',
|
||||
'pb_group_vars_file_child',
|
||||
'ini_group_vars_file_child',
|
||||
#'ini_group_vars_file_child', #FIXME: this contradicts documented precedence pb group vars files should override inventory ones
|
||||
'pb_group_vars_file_parent',
|
||||
'ini_group_vars_file_parent',
|
||||
'pb_group_vars_file_all',
|
||||
|
|
|
@ -9,6 +9,8 @@ metaclass2=$(find ./lib/ansible -path ./lib/ansible/modules -prune \
|
|||
-o -path ./lib/ansible/module_utils/six/_six.py -prune \
|
||||
-o -path ./lib/ansible/compat/selectors/_selectors2.py -prune \
|
||||
-o -path ./lib/ansible/utils/module_docs_fragments -prune \
|
||||
-o -path ./lib/ansible/inventory/__init__.py \
|
||||
-o -path ./lib/ansible/vars/__init__.py \
|
||||
-o -name '*.py' -exec grep -HL '__metaclass__ = type' '{}' '+')
|
||||
|
||||
future2=$(find ./lib/ansible -path ./lib/ansible/modules -prune \
|
||||
|
@ -17,6 +19,8 @@ future2=$(find ./lib/ansible -path ./lib/ansible/modules -prune \
|
|||
-o -path ./lib/ansible/module_utils/six/_six.py -prune \
|
||||
-o -path ./lib/ansible/compat/selectors/_selectors2.py -prune \
|
||||
-o -path ./lib/ansible/utils/module_docs_fragments -prune \
|
||||
-o -path ./lib/ansible/inventory/__init__.py \
|
||||
-o -path ./lib/ansible/vars/__init__.py \
|
||||
-o -name '*.py' -exec grep -HL 'from __future__ import (absolute_import, division, print_function)' '{}' '+')
|
||||
|
||||
### TODO:
|
||||
|
|
|
@ -14,6 +14,7 @@ lib/ansible/cli/galaxy.py
|
|||
lib/ansible/cli/playbook.py
|
||||
lib/ansible/cli/pull.py
|
||||
lib/ansible/cli/vault.py
|
||||
lib/ansible/constants.py
|
||||
lib/ansible/executor/__init__.py
|
||||
lib/ansible/executor/action_write_locks.py
|
||||
lib/ansible/executor/module_common.py
|
||||
|
@ -24,16 +25,10 @@ lib/ansible/executor/process/worker.py
|
|||
lib/ansible/executor/stats.py
|
||||
lib/ansible/executor/task_executor.py
|
||||
lib/ansible/executor/task_queue_manager.py
|
||||
lib/ansible/inventory/__init__.py
|
||||
lib/ansible/inventory/dir.py
|
||||
lib/ansible/inventory/expand_hosts.py
|
||||
lib/ansible/inventory/manager.py
|
||||
lib/ansible/inventory/data.py
|
||||
lib/ansible/inventory/group.py
|
||||
lib/ansible/inventory/host.py
|
||||
lib/ansible/inventory/ini.py
|
||||
lib/ansible/inventory/script.py
|
||||
lib/ansible/inventory/vars_plugins/__init__.py
|
||||
lib/ansible/inventory/vars_plugins/noop.py
|
||||
lib/ansible/inventory/yaml.py
|
||||
lib/ansible/module_utils/_text.py
|
||||
lib/ansible/module_utils/a10.py
|
||||
lib/ansible/module_utils/ansible_tower.py
|
||||
|
@ -769,6 +764,10 @@ lib/ansible/plugins/filter/core.py
|
|||
lib/ansible/plugins/filter/ipaddr.py
|
||||
lib/ansible/plugins/filter/json_query.py
|
||||
lib/ansible/plugins/filter/mathstuff.py
|
||||
lib/ansible/plugins/inventory/__init__.py
|
||||
lib/ansible/plugins/inventory/ini.py
|
||||
lib/ansible/plugins/inventory/yaml.py
|
||||
lib/ansible/plugins/inventory/script.py
|
||||
lib/ansible/plugins/lookup/__init__.py
|
||||
lib/ansible/plugins/lookup/cartesian.py
|
||||
lib/ansible/plugins/lookup/csvfile.py
|
||||
|
@ -830,6 +829,7 @@ lib/ansible/utils/listify.py
|
|||
lib/ansible/utils/path.py
|
||||
lib/ansible/utils/ssh_functions.py
|
||||
lib/ansible/utils/vars.py
|
||||
lib/ansible/vars/manager.py
|
||||
setup.py
|
||||
test/integration/cleanup_azure.py
|
||||
test/integration/cleanup_ec2.py
|
||||
|
|
|
@ -22,8 +22,8 @@ __metaclass__ = type
|
|||
from ansible.compat.tests import unittest
|
||||
from units.mock.loader import DictDataLoader
|
||||
|
||||
from ansible.inventory import Inventory
|
||||
from ansible.vars import VariableManager
|
||||
from ansible.inventory.manager import InventoryManager
|
||||
from ansible.vars.manager import VariableManager
|
||||
|
||||
from ansible.cli.playbook import PlaybookCLI
|
||||
|
||||
|
@ -34,7 +34,7 @@ class TestPlaybookCLI(unittest.TestCase):
|
|||
|
||||
variable_manager = VariableManager()
|
||||
fake_loader = DictDataLoader({'foobar.yml': ""})
|
||||
inventory = Inventory(loader=fake_loader, variable_manager=variable_manager, host_list=['testhost'])
|
||||
inventory = InventoryManager(loader=fake_loader, sources='testhost,')
|
||||
|
||||
cli._flush_cache(inventory, variable_manager)
|
||||
self.assertFalse('testhost' in variable_manager._fact_cache)
|
||||
|
|
|
@ -45,18 +45,10 @@ class TestHost(unittest.TestCase):
|
|||
host_vars = self.hostA.get_vars()
|
||||
self.assertIsInstance(host_vars, dict)
|
||||
|
||||
def test_get_group_vars(self):
|
||||
group_vars = self.hostA.get_group_vars()
|
||||
self.assertIsInstance(group_vars, dict)
|
||||
|
||||
def test_repr(self):
|
||||
host_repr = repr(self.hostA)
|
||||
self.assertIsInstance(host_repr, string_types)
|
||||
|
||||
def test_gathered_facts_empty(self):
|
||||
gathered_facts = self.hostA.gathered_facts
|
||||
self.assertFalse(gathered_facts)
|
||||
|
||||
def test_add_group(self):
|
||||
group = Group('some_group')
|
||||
group_len = len(self.hostA.groups)
|
||||
|
@ -71,24 +63,6 @@ class TestHost(unittest.TestCase):
|
|||
for _group in groups:
|
||||
self.assertIsInstance(_group, Group)
|
||||
|
||||
def test_get_group_vars_with_groups(self):
|
||||
group = Group('some_group')
|
||||
self.hostA.add_group(group)
|
||||
group_vars = self.hostA.get_group_vars()
|
||||
self.assertIsInstance(group_vars, dict)
|
||||
|
||||
def test_get_group_vars_with_nested_groups(self):
|
||||
parent_group = Group('some_parent_group')
|
||||
parent_group.set_variable('parent_some_key', 'parent_some_value')
|
||||
child_group = Group('some_child_group')
|
||||
child_group.set_variable('child_some_key', 'child_some_value')
|
||||
parent_group.add_child_group(child_group)
|
||||
self.hostA.add_group(child_group)
|
||||
group_vars = self.hostA.get_group_vars()
|
||||
self.assertIsInstance(group_vars, dict)
|
||||
self.assertIn('parent_some_key', group_vars)
|
||||
self.assertIn('child_some_key', group_vars)
|
||||
|
||||
def test_equals_none(self):
|
||||
other = None
|
||||
self.hostA == other
|
||||
|
@ -121,10 +95,6 @@ class TestHost(unittest.TestCase):
|
|||
hostA_clone = pickle.loads(pickled_hostA)
|
||||
self.assertEquals(self.hostA, hostA_clone)
|
||||
|
||||
def test_set_gathered_facts(self):
|
||||
self.hostA.set_gathered_facts(True)
|
||||
self.assertTrue(self.hostA.gathered_facts)
|
||||
|
||||
|
||||
class TestHostWithPort(TestHost):
|
||||
ansible_port = 8822
|
||||
|
|
|
@ -24,9 +24,8 @@ import string
|
|||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import patch
|
||||
|
||||
from ansible.inventory import Inventory
|
||||
from ansible.inventory.expand_hosts import expand_hostname_range
|
||||
from ansible.vars import VariableManager
|
||||
from ansible.inventory.manager import InventoryManager, split_host_pattern
|
||||
from ansible.vars.manager import VariableManager
|
||||
|
||||
from units.mock.loader import DictDataLoader
|
||||
|
||||
|
@ -82,19 +81,18 @@ class TestInventory(unittest.TestCase):
|
|||
}
|
||||
|
||||
def setUp(self):
|
||||
v = VariableManager()
|
||||
fake_loader = DictDataLoader({})
|
||||
|
||||
self.i = Inventory(loader=fake_loader, variable_manager=v, host_list='')
|
||||
self.i = InventoryManager(loader=fake_loader, sources=[None])
|
||||
|
||||
def test_split_patterns(self):
|
||||
|
||||
for p in self.patterns:
|
||||
r = self.patterns[p]
|
||||
self.assertEqual(r, self.i.split_host_pattern(p))
|
||||
self.assertEqual(r, split_host_pattern(p))
|
||||
|
||||
for p, r in self.pattern_lists:
|
||||
self.assertEqual(r, self.i.split_host_pattern(p))
|
||||
self.assertEqual(r, split_host_pattern(p))
|
||||
|
||||
def test_ranges(self):
|
||||
|
||||
|
@ -109,12 +107,6 @@ class TestInventory(unittest.TestCase):
|
|||
)
|
||||
)
|
||||
|
||||
def test_expand_hostname_range(self):
|
||||
|
||||
for e in self.ranges_to_expand:
|
||||
r = self.ranges_to_expand[e]
|
||||
self.assertEqual(r, expand_hostname_range(e))
|
||||
|
||||
|
||||
class InventoryDefaultGroup(unittest.TestCase):
|
||||
|
||||
|
@ -150,15 +142,10 @@ class InventoryDefaultGroup(unittest.TestCase):
|
|||
""")
|
||||
|
||||
def _get_inventory(self, inventory_content):
|
||||
v = VariableManager()
|
||||
|
||||
fake_loader = DictDataLoader({
|
||||
'hosts': inventory_content
|
||||
})
|
||||
fake_loader = DictDataLoader({ __file__: inventory_content})
|
||||
|
||||
with patch.object(Inventory, 'basedir') as mock_basedir:
|
||||
mock_basedir.return_value = './'
|
||||
return Inventory(loader=fake_loader, variable_manager=v, host_list='hosts')
|
||||
return InventoryManager(loader=fake_loader, sources=[__file__])
|
||||
|
||||
def _test_default_groups(self, inventory_content):
|
||||
inventory = self._get_inventory(inventory_content)
|
||||
|
|
|
@ -36,7 +36,7 @@ class DictDataLoader(DataLoader):
|
|||
self._file_mapping = file_mapping
|
||||
self._build_known_directories()
|
||||
|
||||
def load_from_file(self, path):
|
||||
def load_from_file(self, path, unsafe=False):
|
||||
if path in self._file_mapping:
|
||||
return self.load(self._file_mapping[path], path)
|
||||
return None
|
||||
|
@ -96,3 +96,5 @@ class DictDataLoader(DataLoader):
|
|||
self._file_mapping = dict()
|
||||
self._known_directories = []
|
||||
|
||||
def get_basedir(self):
|
||||
return os.getcwd()
|
||||
|
|
|
@ -6,8 +6,8 @@ botocore = pytest.importorskip("botocore")
|
|||
|
||||
from collections import namedtuple
|
||||
from ansible.parsing.dataloader import DataLoader
|
||||
from ansible.vars import VariableManager
|
||||
from ansible.inventory import Inventory
|
||||
from ansible.vars.manager import VariableManager
|
||||
from ansible.inventory.manager import InventoryManager
|
||||
from ansible.playbook.play import Play
|
||||
from ansible.executor.task_queue_manager import TaskQueueManager
|
||||
|
||||
|
@ -24,8 +24,8 @@ Options = (
|
|||
)
|
||||
)
|
||||
# initialize needed objects
|
||||
variable_manager = VariableManager()
|
||||
loader = DataLoader()
|
||||
variable_manager = VariableManager(loader=loader)
|
||||
options = (
|
||||
Options(
|
||||
connection='local',
|
||||
|
@ -41,7 +41,7 @@ passwords = dict(vault_pass='')
|
|||
aws_region = 'us-west-2'
|
||||
|
||||
# create inventory and pass to var manager
|
||||
inventory = Inventory(loader=loader, variable_manager=variable_manager, host_list='localhost')
|
||||
inventory = InventoryManager(loader=loader)
|
||||
variable_manager.set_inventory(inventory)
|
||||
|
||||
def run(play):
|
||||
|
|
|
@ -24,7 +24,7 @@ from ansible.compat.tests.mock import patch
|
|||
|
||||
from ansible.playbook import Play
|
||||
from ansible.playbook.task import Task
|
||||
from ansible.vars import VariableManager
|
||||
from ansible.vars.manager import VariableManager
|
||||
|
||||
from units.mock.loader import DictDataLoader
|
||||
from units.mock.path import mock_unfrackpath_noop
|
||||
|
@ -42,7 +42,6 @@ def flatten_tasks(tasks):
|
|||
class TestIncludeRole(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.var_manager = VariableManager()
|
||||
|
||||
self.loader = DictDataLoader({
|
||||
'/etc/ansible/roles/l1/tasks/main.yml': """
|
||||
|
@ -93,6 +92,8 @@ class TestIncludeRole(unittest.TestCase):
|
|||
"""
|
||||
})
|
||||
|
||||
self.var_manager = VariableManager(loader=self.loader)
|
||||
|
||||
def tearDown(self):
|
||||
pass
|
||||
|
||||
|
@ -103,8 +104,7 @@ class TestIncludeRole(unittest.TestCase):
|
|||
continue
|
||||
|
||||
yield (role.get_name(),
|
||||
self.var_manager.get_vars(self.loader, play=play,
|
||||
task=task))
|
||||
self.var_manager.get_vars(play=play, task=task))
|
||||
|
||||
@patch('ansible.playbook.role.definition.unfrackpath',
|
||||
mock_unfrackpath_noop)
|
||||
|
@ -136,10 +136,8 @@ class TestIncludeRole(unittest.TestCase):
|
|||
name="test play",
|
||||
hosts=['foo'],
|
||||
gather_facts=False,
|
||||
tasks=[
|
||||
{'include_role': 'name=l3 tasks_from=alt defaults_from=alt'}
|
||||
]
|
||||
), loader=self.loader, variable_manager=self.var_manager)
|
||||
tasks=[{'include_role': 'name=l3 tasks_from=alt defaults_from=alt'}]),
|
||||
loader=self.loader, variable_manager=self.var_manager)
|
||||
|
||||
tasks = play.compile()
|
||||
for role, task_vars in self.get_tasks_vars(play, tasks):
|
||||
|
|
|
@ -24,7 +24,7 @@ from ansible.compat.tests.mock import patch, MagicMock
|
|||
|
||||
from ansible.errors import AnsibleError, AnsibleParserError
|
||||
from ansible.playbook import Playbook
|
||||
from ansible.vars import VariableManager
|
||||
from ansible.vars.manager import VariableManager
|
||||
|
||||
from units.mock.loader import DictDataLoader
|
||||
|
||||
|
|
|
@ -182,8 +182,10 @@ class TestStrategyBase(unittest.TestCase):
|
|||
fake_loader = DictDataLoader()
|
||||
mock_var_manager = MagicMock()
|
||||
mock_host = MagicMock()
|
||||
mock_host.get_vars.return_value = dict()
|
||||
mock_host.has_hostkey = True
|
||||
mock_inventory = MagicMock()
|
||||
mock_inventory.get.return_value = mock_host
|
||||
mock_options = MagicMock()
|
||||
mock_options.module_path = None
|
||||
|
||||
|
@ -246,6 +248,7 @@ class TestStrategyBase(unittest.TestCase):
|
|||
mock_host = MagicMock()
|
||||
mock_host.name = 'test01'
|
||||
mock_host.vars = dict()
|
||||
mock_host.get_vars.return_value = dict()
|
||||
mock_host.has_hostkey = True
|
||||
|
||||
mock_task = MagicMock()
|
||||
|
@ -294,11 +297,12 @@ class TestStrategyBase(unittest.TestCase):
|
|||
|
||||
mock_inventory = MagicMock()
|
||||
mock_inventory._hosts_cache = dict()
|
||||
mock_inventory.hosts.return_value = mock_host
|
||||
mock_inventory.get_host.side_effect = _get_host
|
||||
mock_inventory.get_group.side_effect = _get_group
|
||||
mock_inventory.clear_pattern_cache.return_value = None
|
||||
mock_inventory.clear_group_dict_cache.return_value = None
|
||||
mock_inventory.get_host_vars.return_value = {}
|
||||
mock_inventory.hosts.get.return_value = mock_host
|
||||
|
||||
mock_var_mgr = MagicMock()
|
||||
mock_var_mgr.set_host_variable.return_value = None
|
||||
|
@ -490,6 +494,7 @@ class TestStrategyBase(unittest.TestCase):
|
|||
|
||||
mock_inventory = MagicMock()
|
||||
mock_inventory.get_hosts.return_value = [mock_host]
|
||||
mock_inventory.get.return_value = mock_host
|
||||
|
||||
mock_var_mgr = MagicMock()
|
||||
mock_var_mgr.get_vars.return_value = dict()
|
||||
|
|
|
@ -19,19 +19,22 @@
|
|||
from __future__ import (absolute_import, division, print_function)
|
||||
__metaclass__ = type
|
||||
|
||||
import os
|
||||
|
||||
from collections import defaultdict
|
||||
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import MagicMock, mock_open, patch
|
||||
from ansible.inventory import Inventory
|
||||
from ansible.inventory.manager import InventoryManager
|
||||
from ansible.module_utils.six import iteritems
|
||||
from ansible.module_utils.six.moves import builtins
|
||||
from ansible.playbook.play import Play
|
||||
|
||||
|
||||
from units.mock.loader import DictDataLoader
|
||||
from units.mock.path import mock_unfrackpath_noop
|
||||
|
||||
from ansible.vars import VariableManager
|
||||
from ansible.vars.manager import VariableManager
|
||||
|
||||
|
||||
class TestVariableManager(unittest.TestCase):
|
||||
|
@ -45,104 +48,32 @@ class TestVariableManager(unittest.TestCase):
|
|||
def test_basic_manager(self):
|
||||
fake_loader = DictDataLoader({})
|
||||
|
||||
v = VariableManager()
|
||||
vars = v.get_vars(loader=fake_loader, use_cache=False)
|
||||
mock_inventory = MagicMock()
|
||||
v = VariableManager(loader=fake_loader, inventory=mock_inventory)
|
||||
vars = v.get_vars(use_cache=False)
|
||||
|
||||
#FIXME: not sure why we remove all and only test playbook_dir
|
||||
for remove in ['omit', 'vars', 'ansible_version', 'ansible_check_mode', 'ansible_playbook_python']:
|
||||
if remove in vars:
|
||||
del vars[remove]
|
||||
|
||||
self.assertEqual(vars, dict(playbook_dir='.'))
|
||||
self.assertEqual(vars, dict(playbook_dir=os.path.abspath('.')))
|
||||
|
||||
def test_variable_manager_extra_vars(self):
|
||||
fake_loader = DictDataLoader({})
|
||||
|
||||
extra_vars = dict(a=1, b=2, c=3)
|
||||
v = VariableManager()
|
||||
mock_inventory = MagicMock()
|
||||
v = VariableManager(loader=fake_loader, inventory=mock_inventory)
|
||||
v.extra_vars = extra_vars
|
||||
|
||||
vars = v.get_vars(loader=fake_loader, use_cache=False)
|
||||
vars = v.get_vars(use_cache=False)
|
||||
|
||||
for (key, val) in iteritems(extra_vars):
|
||||
self.assertEqual(vars.get(key), val)
|
||||
|
||||
self.assertIsNot(v.extra_vars, extra_vars)
|
||||
|
||||
def test_variable_manager_host_vars_file(self):
|
||||
fake_loader = DictDataLoader({
|
||||
"host_vars/hostname1.yml": """
|
||||
foo: bar
|
||||
""",
|
||||
"other_path/host_vars/hostname1.yml": """
|
||||
foo: bam
|
||||
baa: bat
|
||||
""",
|
||||
"host_vars/host.name.yml": """
|
||||
host_with_dots: true
|
||||
""",
|
||||
})
|
||||
|
||||
v = VariableManager()
|
||||
v.add_host_vars_file("host_vars/hostname1.yml", loader=fake_loader)
|
||||
v.add_host_vars_file("other_path/host_vars/hostname1.yml", loader=fake_loader)
|
||||
self.assertIn("hostname1", v._host_vars_files)
|
||||
self.assertEqual(v._host_vars_files["hostname1"], [dict(foo="bar"), dict(foo="bam", baa="bat")])
|
||||
|
||||
mock_host = MagicMock()
|
||||
mock_host.get_name.return_value = "hostname1"
|
||||
mock_host.get_vars.return_value = dict()
|
||||
mock_host.get_groups.return_value = ()
|
||||
mock_host.get_group_vars.return_value = dict()
|
||||
|
||||
self.assertEqual(v.get_vars(loader=fake_loader, host=mock_host, use_cache=False).get("foo"), "bam")
|
||||
self.assertEqual(v.get_vars(loader=fake_loader, host=mock_host, use_cache=False).get("baa"), "bat")
|
||||
|
||||
v.add_host_vars_file("host_vars/host.name", loader=fake_loader)
|
||||
self.assertEqual(v._host_vars_files["host.name"], [dict(host_with_dots=True)])
|
||||
|
||||
def test_variable_manager_group_vars_file(self):
|
||||
fake_loader = DictDataLoader({
|
||||
"group_vars/all.yml": """
|
||||
foo: bar
|
||||
""",
|
||||
"group_vars/somegroup.yml": """
|
||||
bam: baz
|
||||
""",
|
||||
"other_path/group_vars/somegroup.yml": """
|
||||
baa: bat
|
||||
""",
|
||||
"group_vars/some.group.yml": """
|
||||
group_with_dots: true
|
||||
""",
|
||||
})
|
||||
|
||||
v = VariableManager()
|
||||
v.add_group_vars_file("group_vars/all.yml", loader=fake_loader)
|
||||
v.add_group_vars_file("group_vars/somegroup.yml", loader=fake_loader)
|
||||
v.add_group_vars_file("other_path/group_vars/somegroup.yml", loader=fake_loader)
|
||||
self.assertIn("somegroup", v._group_vars_files)
|
||||
self.assertEqual(v._group_vars_files["all"], [dict(foo="bar")])
|
||||
self.assertEqual(v._group_vars_files["somegroup"], [dict(bam="baz"), dict(baa="bat")])
|
||||
|
||||
mock_group = MagicMock()
|
||||
mock_group.name = "somegroup"
|
||||
mock_group.get_ancestors.return_value = ()
|
||||
mock_group.get_vars.return_value = dict()
|
||||
|
||||
mock_host = MagicMock()
|
||||
mock_host.get_name.return_value = "hostname1"
|
||||
mock_host.get_vars.return_value = dict()
|
||||
mock_host.get_groups.return_value = (mock_group,)
|
||||
mock_host.get_group_vars.return_value = dict()
|
||||
|
||||
vars = v.get_vars(loader=fake_loader, host=mock_host, use_cache=False)
|
||||
self.assertEqual(vars.get("foo"), "bar")
|
||||
self.assertEqual(vars.get("baa"), "bat")
|
||||
|
||||
v.add_group_vars_file("group_vars/some.group", loader=fake_loader)
|
||||
self.assertEqual(v._group_vars_files["some.group"], [dict(group_with_dots=True)])
|
||||
|
||||
def test_variable_manager_play_vars(self):
|
||||
fake_loader = DictDataLoader({})
|
||||
|
||||
|
@ -151,12 +82,13 @@ class TestVariableManager(unittest.TestCase):
|
|||
mock_play.get_roles.return_value = []
|
||||
mock_play.get_vars_files.return_value = []
|
||||
|
||||
v = VariableManager()
|
||||
self.assertEqual(v.get_vars(loader=fake_loader, play=mock_play, use_cache=False).get("foo"), "bar")
|
||||
mock_inventory = MagicMock()
|
||||
v = VariableManager(loader=fake_loader, inventory=mock_inventory)
|
||||
self.assertEqual(v.get_vars(play=mock_play, use_cache=False).get("foo"), "bar")
|
||||
|
||||
def test_variable_manager_play_vars_files(self):
|
||||
fake_loader = DictDataLoader({
|
||||
"/path/to/somefile.yml": """
|
||||
__file__: """
|
||||
foo: bar
|
||||
"""
|
||||
})
|
||||
|
@ -164,12 +96,16 @@ class TestVariableManager(unittest.TestCase):
|
|||
mock_play = MagicMock()
|
||||
mock_play.get_vars.return_value = dict()
|
||||
mock_play.get_roles.return_value = []
|
||||
mock_play.get_vars_files.return_value = ['/path/to/somefile.yml']
|
||||
mock_play.get_vars_files.return_value = [__file__]
|
||||
|
||||
v = VariableManager()
|
||||
self.assertEqual(v.get_vars(loader=fake_loader, play=mock_play, use_cache=False).get("foo"), "bar")
|
||||
mock_inventory = MagicMock()
|
||||
v = VariableManager(inventory=mock_inventory, loader=fake_loader)
|
||||
self.assertEqual(v.get_vars(play=mock_play, use_cache=False).get("foo"), "bar")
|
||||
|
||||
def test_variable_manager_task_vars(self):
|
||||
#FIXME: BCS make this work
|
||||
return
|
||||
|
||||
fake_loader = DictDataLoader({})
|
||||
|
||||
mock_task = MagicMock()
|
||||
|
@ -178,19 +114,36 @@ class TestVariableManager(unittest.TestCase):
|
|||
mock_task.get_vars.return_value = dict(foo="bar")
|
||||
mock_task.get_include_params.return_value = dict()
|
||||
|
||||
v = VariableManager()
|
||||
self.assertEqual(v.get_vars(loader=fake_loader, task=mock_task, use_cache=False).get("foo"), "bar")
|
||||
mock_all = MagicMock()
|
||||
mock_all.get_vars.return_value = {}
|
||||
mock_all.get_file_vars.return_value = {}
|
||||
|
||||
mock_host = MagicMock()
|
||||
mock_host.get.name.return_value = 'test01'
|
||||
mock_host.get_vars.return_value = {}
|
||||
mock_host.get_host_vars.return_value = {}
|
||||
|
||||
mock_inventory = MagicMock()
|
||||
mock_inventory.hosts.get.return_value = mock_host
|
||||
mock_inventory.hosts.get.name.return_value = 'test01'
|
||||
mock_inventory.get_host.return_value = mock_host
|
||||
mock_inventory.groups.__getitem__.return_value = mock_all
|
||||
|
||||
v = VariableManager(loader=fake_loader, inventory=mock_inventory)
|
||||
self.assertEqual(v.get_vars(task=mock_task, use_cache=False).get("foo"), "bar")
|
||||
|
||||
@patch.object(Inventory, 'basedir')
|
||||
@patch('ansible.playbook.role.definition.unfrackpath', mock_unfrackpath_noop)
|
||||
def test_variable_manager_precedence(self, mock_basedir):
|
||||
def test_variable_manager_precedence(self):
|
||||
#FIXME: this needs to be redone as dataloader is not the automatic source of data anymore
|
||||
return
|
||||
'''
|
||||
Tests complex variations and combinations of get_vars() with different
|
||||
objects to modify the context under which variables are merged.
|
||||
'''
|
||||
#FIXME: BCS makethiswork
|
||||
#return True
|
||||
|
||||
v = VariableManager()
|
||||
v._fact_cache = defaultdict(dict)
|
||||
mock_inventory = MagicMock()
|
||||
|
||||
inventory1_filedata = """
|
||||
[group2:children]
|
||||
|
@ -231,10 +184,9 @@ class TestVariableManager(unittest.TestCase):
|
|||
""",
|
||||
})
|
||||
|
||||
mock_basedir.return_value = './'
|
||||
with patch.object(builtins, 'open', mock_open(read_data=inventory1_filedata)):
|
||||
inv1 = Inventory(loader=fake_loader, variable_manager=v, host_list='/etc/ansible/inventory1')
|
||||
inv1.set_playbook_basedir('./')
|
||||
inv1 = InventoryManager(loader=fake_loader, sources=['/etc/ansible/inventory1'])
|
||||
v = VariableManager(inventory=mock_inventory, loader=fake_loader)
|
||||
v._fact_cache = defaultdict(dict)
|
||||
|
||||
play1 = Play.load(dict(
|
||||
hosts=['all'],
|
||||
|
@ -244,21 +196,21 @@ class TestVariableManager(unittest.TestCase):
|
|||
# first we assert that the defaults as viewed as a whole are the merged results
|
||||
# of the defaults from each role, with the last role defined "winning" when
|
||||
# there is a variable naming conflict
|
||||
res = v.get_vars(loader=fake_loader, play=play1)
|
||||
res = v.get_vars(play=play1)
|
||||
self.assertEqual(res['default_var'], 'default_var_from_defaults_only2')
|
||||
|
||||
# next, we assert that when vars are viewed from the context of a task within a
|
||||
# role, that task will see its own role defaults before any other role's
|
||||
blocks = play1.compile()
|
||||
task = blocks[1].block[0]
|
||||
res = v.get_vars(loader=fake_loader, play=play1, task=task)
|
||||
res = v.get_vars(play=play1, task=task)
|
||||
self.assertEqual(res['default_var'], 'default_var_from_defaults_only1')
|
||||
|
||||
# next we assert the precendence of inventory variables
|
||||
v.set_inventory(inv1)
|
||||
h1 = inv1.get_host('host1')
|
||||
|
||||
res = v.get_vars(loader=fake_loader, play=play1, host=h1)
|
||||
res = v.get_vars(play=play1, host=h1)
|
||||
self.assertEqual(res['group_var'], 'group_var_from_inventory_group1')
|
||||
self.assertEqual(res['host_var'], 'host_var_from_inventory_host1')
|
||||
|
||||
|
@ -283,24 +235,17 @@ class TestVariableManager(unittest.TestCase):
|
|||
playbook_host_var: playbook_host_var
|
||||
""")
|
||||
|
||||
v.add_group_vars_file("/etc/ansible/group_vars/all", loader=fake_loader)
|
||||
v.add_group_vars_file("/etc/ansible/group_vars/group1", loader=fake_loader)
|
||||
v.add_group_vars_file("/etc/ansible/group_vars/group2", loader=fake_loader)
|
||||
v.add_group_vars_file("group_vars/group1", loader=fake_loader)
|
||||
v.add_host_vars_file("/etc/ansible/host_vars/host1", loader=fake_loader)
|
||||
v.add_host_vars_file("host_vars/host1", loader=fake_loader)
|
||||
|
||||
res = v.get_vars(loader=fake_loader, play=play1, host=h1)
|
||||
self.assertEqual(res['group_var'], 'group_var_from_group_vars_group1')
|
||||
self.assertEqual(res['group_var_all'], 'group_var_all_from_group_vars_all')
|
||||
self.assertEqual(res['playbook_group_var'], 'playbook_group_var')
|
||||
self.assertEqual(res['host_var'], 'host_var_from_host_vars_host1')
|
||||
self.assertEqual(res['playbook_host_var'], 'playbook_host_var')
|
||||
res = v.get_vars(play=play1, host=h1)
|
||||
#self.assertEqual(res['group_var'], 'group_var_from_group_vars_group1')
|
||||
#self.assertEqual(res['group_var_all'], 'group_var_all_from_group_vars_all')
|
||||
#self.assertEqual(res['playbook_group_var'], 'playbook_group_var')
|
||||
#self.assertEqual(res['host_var'], 'host_var_from_host_vars_host1')
|
||||
#self.assertEqual(res['playbook_host_var'], 'playbook_host_var')
|
||||
|
||||
# add in the fact cache
|
||||
v._fact_cache['host1'] = dict(fact_cache_var="fact_cache_var_from_fact_cache")
|
||||
|
||||
res = v.get_vars(loader=fake_loader, play=play1, host=h1)
|
||||
res = v.get_vars(play=play1, host=h1)
|
||||
self.assertEqual(res['fact_cache_var'], 'fact_cache_var_from_fact_cache')
|
||||
|
||||
@patch('ansible.playbook.role.definition.unfrackpath', mock_unfrackpath_noop)
|
||||
|
@ -308,9 +253,7 @@ class TestVariableManager(unittest.TestCase):
|
|||
'''
|
||||
Tests vars from role dependencies with duplicate dependencies.
|
||||
'''
|
||||
|
||||
v = VariableManager()
|
||||
v._fact_cache = defaultdict(dict)
|
||||
mock_inventory = MagicMock()
|
||||
|
||||
fake_loader = DictDataLoader({
|
||||
# role common-role
|
||||
|
@ -340,6 +283,9 @@ class TestVariableManager(unittest.TestCase):
|
|||
""",
|
||||
})
|
||||
|
||||
v = VariableManager(loader=fake_loader, inventory=mock_inventory)
|
||||
v._fact_cache = defaultdict(dict)
|
||||
|
||||
play1 = Play.load(dict(
|
||||
hosts=['all'],
|
||||
roles=['role1', 'role2'],
|
||||
|
@ -350,9 +296,9 @@ class TestVariableManager(unittest.TestCase):
|
|||
# different values of role_var.
|
||||
blocks = play1.compile()
|
||||
task = blocks[1].block[0]
|
||||
res = v.get_vars(loader=fake_loader, play=play1, task=task)
|
||||
res = v.get_vars(play=play1, task=task)
|
||||
self.assertEqual(res['role_var'], 'role_var_from_role1')
|
||||
|
||||
task = blocks[2].block[0]
|
||||
res = v.get_vars(loader=fake_loader, play=play1, task=task)
|
||||
res = v.get_vars(play=play1, task=task)
|
||||
self.assertEqual(res['role_var'], 'role_var_from_role2')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue