ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-16 01:45:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add dellos10 changes for python3 (#24608)

Browse source 
Make `execute_command` arguments and its
return value complaint to PY3 changes
made in PR #24431
This commit is contained in:
Ganesh Nalawade 2017-05-17 00:36:15 +05:30 • committed by GitHub
parent a3c689bf0d
commit 442df927f1
2 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/module_utils/dellos10.py
View file

@ -31,6 +31,7 @@
#
import re
from ansible.module_utils._text import to_text
from ansible.module_utils.basic import env_fallback, return_values
from ansible.module_utils.network_common import to_list, ComplexList
from ansible.module_utils.connection import exec_command
@ -80,8 +81,8 @@ def get_config(module, flags=[]):
except KeyError:
rc, out, err = exec_command(module, cmd)
if rc != 0:
module.fail_json(msg='unable to retrieve current config', stderr=err)
cfg = str(out).strip()
module.fail_json(msg='unable to retrieve current config', stderr=to_text(err, errors='surrogate_or_strict'))
cfg = to_text(out, errors='surrogate_or_strict').strip()
_DEVICE_CONFIGS[cmd] = cfg
return cfg
@ -103,15 +104,15 @@ def run_commands(module, commands, check_rc=True):
cmd = module.jsonify(cmd)
rc, out, err = exec_command(module, cmd)
if check_rc and rc != 0:
module.fail_json(msg=err, rc=rc)
responses.append(out)
module.fail_json(msg=to_text(err, errors='surrogate_or_strict'), rc=rc)
responses.append(to_text(out, errors='surrogate_or_strict'))
return responses
def load_config(module, commands):
rc, out, err = exec_command(module, 'configure terminal')
if rc != 0:
module.fail_json(msg='unable to enter configuration mode', err=err)
module.fail_json(msg='unable to enter configuration mode', err=to_text(err, errors='surrogate_or_strict'))
commands.append('commit')
for command in to_list(commands):
@ -120,7 +121,7 @@ def load_config(module, commands):
cmd = {'command': command, 'prompt': WARNING_PROMPTS_RE, 'answer': 'yes'}
rc, out, err = exec_command(module, module.jsonify(cmd))
if rc != 0:
module.fail_json(msg=err, command=command, rc=rc)
module.fail_json(msg=to_text(err, errors='surrogate_or_strict'), command=command, rc=rc)
exec_command(module, 'end')