cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Correctly call get_config (#20452)

Browse source 
* Correctly call get_config

* remove debug

* Check for empty flags and LocalAnsibleModule

* Peter's feedback
This commit is contained in:
John R Barker 2017-01-20 20:17:35 +00:00 committed by GitHub
parent 92a568c816
commit 7330ab8062
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/network/ios/_ios_template.py
View file

@ -150,7 +150,7 @@ def get_current_config(module):
flags = ['all'] flags = ['all']
else: else:
flags = [] flags = []
return get_config(flags=flags) return get_config(module=module, flags=flags)
def main(): def main():
""" main entry point for module execution """ main entry point for module execution
@ -182,7 +182,7 @@ def main():
result = {'changed': False} result = {'changed': False}
if module.params['backup']: if module.params['backup']:
result['__backup__'] = get_config() result['__backup__'] = get_config(module=module)
if not module.params['force']: if not module.params['force']:
contents = get_current_config(module) contents = get_current_config(module)
@ -195,7 +195,7 @@ def main():
if commands: if commands:
if not module.check_mode: if not module.check_mode:
load_config(commands) load_config(module, commands)
result['changed'] = True result['changed'] = True
result['updates'] = commands result['updates'] = commands

4
lib/ansible/modules/network/ios/ios_config.py
View file

@ -366,7 +366,7 @@ def main():
if match != 'none': if match != 'none':
config, have_banners = get_running_config(module) config, have_banners = get_running_config(module)
path = module.params['parents'] path = module.params['parents']
configobjs = candidate.difference(config, path=path,match=match, configobjs = candidate.difference(config, path=path, match=match,
replace=replace) replace=replace)
else: else:
configobjs = candidate.items configobjs = candidate.items
@ -398,7 +398,7 @@ def main():
result['changed'] = True result['changed'] = True
if module.params['backup']: if module.params['backup']:
result['__backup__'] = get_config() result['__backup__'] = get_config(module=module)
if module.params['save']: if module.params['save']:
if not module.check_mode: if not module.check_mode:

8
test/units/modules/network/ios/test_ios_template.py
View file

@ -29,7 +29,7 @@ from ansible.errors import AnsibleModuleExit
from ansible.modules.network.ios import _ios_template from ansible.modules.network.ios import _ios_template
from ansible.module_utils import basic from ansible.module_utils import basic
from ansible.module_utils._text import to_bytes from ansible.module_utils._text import to_bytes
from ansible.module_utils.local import LocalAnsibleModule
def set_module_args(args): def set_module_args(args):
args = json.dumps({'ANSIBLE_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') src = load_fixture('ios_template_config.cfg')
set_module_args(dict(src=src, include_defaults=False)) set_module_args(dict(src=src, include_defaults=False))
self.execute_module() 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): def test_ios_template_backup(self):
set_module_args(dict(backup=True)) set_module_args(dict(backup=True))