mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Correctly call get_config (#20452)
* Correctly call get_config * remove debug * Check for empty flags and LocalAnsibleModule * Peter's feedback
This commit is contained in:
parent
92a568c816
commit
7330ab8062
3 changed files with 12 additions and 8 deletions
|
@ -150,7 +150,7 @@ def get_current_config(module):
|
|||
flags = ['all']
|
||||
else:
|
||||
flags = []
|
||||
return get_config(flags=flags)
|
||||
return get_config(module=module, flags=flags)
|
||||
|
||||
def main():
|
||||
""" main entry point for module execution
|
||||
|
@ -182,7 +182,7 @@ def main():
|
|||
result = {'changed': False}
|
||||
|
||||
if module.params['backup']:
|
||||
result['__backup__'] = get_config()
|
||||
result['__backup__'] = get_config(module=module)
|
||||
|
||||
if not module.params['force']:
|
||||
contents = get_current_config(module)
|
||||
|
@ -195,7 +195,7 @@ def main():
|
|||
|
||||
if commands:
|
||||
if not module.check_mode:
|
||||
load_config(commands)
|
||||
load_config(module, commands)
|
||||
result['changed'] = True
|
||||
|
||||
result['updates'] = commands
|
||||
|
|
|
@ -366,7 +366,7 @@ def main():
|
|||
if match != 'none':
|
||||
config, have_banners = get_running_config(module)
|
||||
path = module.params['parents']
|
||||
configobjs = candidate.difference(config, path=path,match=match,
|
||||
configobjs = candidate.difference(config, path=path, match=match,
|
||||
replace=replace)
|
||||
else:
|
||||
configobjs = candidate.items
|
||||
|
@ -398,7 +398,7 @@ def main():
|
|||
result['changed'] = True
|
||||
|
||||
if module.params['backup']:
|
||||
result['__backup__'] = get_config()
|
||||
result['__backup__'] = get_config(module=module)
|
||||
|
||||
if module.params['save']:
|
||||
if not module.check_mode:
|
||||
|
|
|
@ -29,7 +29,7 @@ from ansible.errors import AnsibleModuleExit
|
|||
from ansible.modules.network.ios import _ios_template
|
||||
from ansible.module_utils import basic
|
||||
from ansible.module_utils._text import to_bytes
|
||||
|
||||
from ansible.module_utils.local import LocalAnsibleModule
|
||||
|
||||
def set_module_args(args):
|
||||
args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
|
||||
|
@ -118,7 +118,11 @@ class TestIosTemplateModule(unittest.TestCase):
|
|||
src = load_fixture('ios_template_config.cfg')
|
||||
set_module_args(dict(src=src, include_defaults=False))
|
||||
self.execute_module()
|
||||
self.get_config.assert_called_with(flags=[])
|
||||
_, kwargs = self.get_config.call_args
|
||||
# Ensure flags doesn't contain "default", or any other value
|
||||
self.assertEqual(kwargs['flags'], [])
|
||||
self.assertIsInstance(kwargs['module'], LocalAnsibleModule)
|
||||
|
||||
|
||||
def test_ios_template_backup(self):
|
||||
set_module_args(dict(backup=True))
|
||||
|
|
Loading…
Reference in a new issue