ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-26 14:41:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixes#5534-Handled Command Prompt in exec mode (#21651)

Browse source 
* Fixes#5534-Handled Command Prompt in exec mode

* Pep8 Cleanup
This commit is contained in:
Dhivyap 2017-02-22 20:28:21 +05:30 • committed by Peter Sprygada
commit 75d7c70e70
3 changed files with 60 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/network/dellos10/dellos10_command.py
View file

@ -143,16 +143,30 @@ warnings:
from ansible.module_utils.basic import get_exception
from ansible.module_utils.netcli import CommandRunner, FailedConditionsError
from ansible.module_utils.network import NetworkModule, NetworkError
from ansible.module_utils.six import string_types
import ansible.module_utils.dellos10
VALID_KEYS = ['command', 'prompt', 'response']
def to_lines(stdout):
for item in stdout:
if isinstance(item, basestring):
item = str(item).split('\n')
yield item
def parse_commands(module):
for cmd in module.params['commands']:
if isinstance(cmd, string_types):
cmd = dict(command=cmd, output=None)
elif 'command' not in cmd:
module.fail_json(msg='command keyword argument is required')
elif not set(cmd.keys()).issubset(VALID_KEYS):
module.fail_json(msg='unknown keyword specified')
yield cmd
def main():
spec = dict(
# { command: <str>, prompt: <str>, response: <str> }
commands=dict(type='list', required=True),
wait_for=dict(type='list'),
retries=dict(default=10, type='int'),
@ -163,7 +177,7 @@ def main():
connect_on_load=False,
supports_check_mode=True)
commands = module.params['commands']
commands = list(parse_commands(module))
conditionals = module.params['wait_for'] or list()
warnings = list()
@ -171,15 +185,15 @@ def main():
runner = CommandRunner(module)
for cmd in commands:
if module.check_mode and not cmd.startswith('show'):
if module.check_mode and not cmd['command'].startswith('show'):
warnings.append('only show commands are supported when using '
'check mode, not executing `%s`' % cmd)
else:
if cmd.startswith('conf'):
if cmd['command'].startswith('conf'):
module.fail_json(msg='dellos10_command does not support running '
'config mode commands. Please use '
'dellos10_config instead')
runner.add_command(cmd)
runner.add_command(**cmd)
for item in conditionals:
runner.add_conditional(item)
@ -201,7 +215,7 @@ def main():
result['stdout'] = list()
for cmd in commands:
try:
output = runner.get_command(cmd)
output = runner.get_command(cmd['command'])
except ValueError:
output = 'command not executed due to check_mode, see warnings'
result['stdout'].append(output)