ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Don't fail on configure in command (#37011)

Browse source 
* Don't fail on configure in command

* Change test to check mode
This commit is contained in:
Nathaniel Case 2018-03-06 18:10:09 -05:00 committed by GitHub
parent 67ffde4ac1
commit efb8b539c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/network/ios/ios_command.py
View file

@ -166,17 +166,18 @@ def parse_commands(module, warnings):
commands = command(module.params['commands']) commands = command(module.params['commands'])
for item in list(commands): for item in list(commands):
configure_type = re.match(r'conf(?:\w*)(?:\s+(\w+))?', item['command']) configure_type = re.match(r'conf(?:\w*)(?:\s+(\w+))?', item['command'])
if module.check_mode and not item['command'].startswith('show'): if module.check_mode:
if configure_type and configure_type.group(1) not in ('confirm', 'replace', 'revert', 'network'):
module.fail_json(
msg='ios_command does not support running config mode '
'commands. Please use ios_config instead'
)
if not item['command'].startswith('show'):
warnings.append( warnings.append(
'only show commands are supported when using check mode, not ' 'only show commands are supported when using check mode, not '
'executing `%s`' % item['command'] 'executing `%s`' % item['command']
) )
commands.remove(item) commands.remove(item)
elif configure_type and configure_type.group(1) not in ('confirm', 'replace', 'revert', 'network'):
module.fail_json(
msg='ios_command does not support running config mode '
'commands. Please use ios_config instead'
)
return commands return commands

5
test/units/modules/network/ios/test_ios_command.py
View file

@ -109,7 +109,10 @@ class TestIosCommandModule(TestIosModule):
def test_ios_command_configure_error(self): def test_ios_command_configure_error(self):
commands = ['configure terminal'] commands = ['configure terminal']
set_module_args(dict(commands=commands)) set_module_args({
'commands': commands,
'_ansible_check_mode': True,
})
result = self.execute_module(failed=True) result = self.execute_module(failed=True)
self.assertEqual( self.assertEqual(
result['msg'], result['msg'],