mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-05-06 01:01:32 -07:00
Fix inventory cache interface (#50446)
* Replace InventoryFileCacheModule with a better developer-interface Use new interface for inventory plugins with backwards compatibility Auto-update the backing cache-plugin if the cache has changed after parsing the inventory plugin * Update CacheModules to use the config system and add a deprecation warning if they are being imported directly rather than using cache_loader * Fix foreman inventory caching * Add tests * Add integration test to check that fact caching works normally with cache plugins using ansible.constants and inventory caching provides a helpful error for non-compatible cache plugins * Add some developer documentation for inventory and cache plugins * Add user documentation for inventory caching * Add deprecation docs * Apply suggestions from docs review * Add changelog
This commit is contained in:
parent
831f068f98
commit
9687879840
24 changed files with 831 additions and 86 deletions
66
test/units/plugins/cache/test_cache.py
vendored
66
test/units/plugins/cache/test_cache.py
vendored
|
@ -21,9 +21,10 @@ __metaclass__ = type
|
|||
|
||||
from units.compat import unittest, mock
|
||||
from ansible.errors import AnsibleError
|
||||
from ansible.plugins.cache import FactCache
|
||||
from ansible.plugins.cache import FactCache, CachePluginAdjudicator
|
||||
from ansible.plugins.cache.base import BaseCacheModule
|
||||
from ansible.plugins.cache.memory import CacheModule as MemoryCache
|
||||
from ansible.plugins.loader import cache_loader
|
||||
|
||||
HAVE_MEMCACHED = True
|
||||
try:
|
||||
|
@ -43,6 +44,57 @@ except ImportError:
|
|||
else:
|
||||
from ansible.plugins.cache.redis import CacheModule as RedisCache
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
class TestCachePluginAdjudicator:
|
||||
# memory plugin cache
|
||||
cache = CachePluginAdjudicator()
|
||||
cache['cache_key'] = {'key1': 'value1', 'key2': 'value2'}
|
||||
cache['cache_key_2'] = {'key': 'value'}
|
||||
|
||||
def test___setitem__(self):
|
||||
self.cache['new_cache_key'] = {'new_key1': ['new_value1', 'new_value2']}
|
||||
assert self.cache['new_cache_key'] == {'new_key1': ['new_value1', 'new_value2']}
|
||||
|
||||
def test_inner___setitem__(self):
|
||||
self.cache['new_cache_key'] = {'new_key1': ['new_value1', 'new_value2']}
|
||||
self.cache['new_cache_key']['new_key1'][0] = 'updated_value1'
|
||||
assert self.cache['new_cache_key'] == {'new_key1': ['updated_value1', 'new_value2']}
|
||||
|
||||
def test___contains__(self):
|
||||
assert 'cache_key' in self.cache
|
||||
assert 'not_cache_key' not in self.cache
|
||||
|
||||
def test_get(self):
|
||||
assert self.cache.get('cache_key') == {'key1': 'value1', 'key2': 'value2'}
|
||||
|
||||
def test_get_with_default(self):
|
||||
assert self.cache.get('foo', 'bar') == 'bar'
|
||||
|
||||
def test_get_without_default(self):
|
||||
assert self.cache.get('foo') is None
|
||||
|
||||
def test___getitem__(self):
|
||||
with pytest.raises(KeyError) as err:
|
||||
self.cache['foo']
|
||||
|
||||
def test_pop_with_default(self):
|
||||
assert self.cache.pop('foo', 'bar') == 'bar'
|
||||
|
||||
def test_pop_without_default(self):
|
||||
with pytest.raises(KeyError) as err:
|
||||
assert self.cache.pop('foo')
|
||||
|
||||
def test_pop(self):
|
||||
v = self.cache.pop('cache_key_2')
|
||||
assert v == {'key': 'value'}
|
||||
assert 'cache_key_2' not in self.cache
|
||||
|
||||
def test_update(self):
|
||||
self.cache.update({'cache_key': {'key2': 'updatedvalue'}})
|
||||
assert self.cache['cache_key']['key2'] == 'updatedvalue'
|
||||
|
||||
|
||||
class TestFactCache(unittest.TestCase):
|
||||
|
||||
|
@ -116,9 +168,21 @@ class TestAbstractClass(unittest.TestCase):
|
|||
def test_memcached_cachemodule(self):
|
||||
self.assertIsInstance(MemcachedCache(), MemcachedCache)
|
||||
|
||||
@unittest.skipUnless(HAVE_MEMCACHED, 'python-memcached module not installed')
|
||||
def test_memcached_cachemodule_with_loader(self):
|
||||
self.assertIsInstance(cache_loader.get('memcached'), MemcachedCache)
|
||||
|
||||
def test_memory_cachemodule(self):
|
||||
self.assertIsInstance(MemoryCache(), MemoryCache)
|
||||
|
||||
def test_memory_cachemodule_with_loader(self):
|
||||
self.assertIsInstance(cache_loader.get('memory'), MemoryCache)
|
||||
|
||||
@unittest.skipUnless(HAVE_REDIS, 'Redis python module not installed')
|
||||
def test_redis_cachemodule(self):
|
||||
self.assertIsInstance(RedisCache(), RedisCache)
|
||||
|
||||
@unittest.skipUnless(HAVE_REDIS, 'Redis python module not installed')
|
||||
def test_redis_cachemodule_with_loader(self):
|
||||
# The _uri option is required for the redis plugin
|
||||
self.assertIsInstance(cache_loader.get('redis', **{'_uri': '127.0.0.1:6379:1'}), RedisCache)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue