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

Add dellos6 changes for Python3 (#24606)

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:32 +05:30 committed by GitHub
parent 442df927f1
commit a883635aeb
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

35
lib/ansible/plugins/terminal/dellos6.py
View file

@ -21,6 +21,7 @@ __metaclass__ = type
import re import re
import json import json
from ansible.module_utils._text import to_text, to_bytes
from ansible.plugins.terminal import TerminalBase from ansible.plugins.terminal import TerminalBase
from ansible.errors import AnsibleConnectionFailure from ansible.errors import AnsibleConnectionFailure
@ -28,34 +29,34 @@ from ansible.errors import AnsibleConnectionFailure
class TerminalModule(TerminalBase): class TerminalModule(TerminalBase):
terminal_stdout_re = [ terminal_stdout_re = [
re.compile(r"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"), re.compile(br"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"),
re.compile(r"\[\w+\@[\w\-\.]+(?: [^\]])\] ?[>#\$] ?$") re.compile(br"\[\w+\@[\w\-\.]+(?: [^\]])\] ?[>#\$] ?$")
] ]
terminal_stderr_re = [ terminal_stderr_re = [
re.compile(r"% ?Error: (?:(?!\bdoes not exist\b)(?!\balready exists\b)(?!\bHost not found\b)(?!\bnot active\b).)*$"), re.compile(br"% ?Error: (?:(?!\bdoes not exist\b)(?!\balready exists\b)(?!\bHost not found\b)(?!\bnot active\b).)*$"),
re.compile(r"% ?Bad secret"), re.compile(br"% ?Bad secret"),
re.compile(r"invalid input", re.I), re.compile(br"invalid input", re.I),
re.compile(r"(?:incomplete|ambiguous) command", re.I), re.compile(br"(?:incomplete|ambiguous) command", re.I),
re.compile(r"connection timed out", re.I), re.compile(br"connection timed out", re.I),
re.compile(r"'[^']' +returned error code: ?\d+"), re.compile(br"'[^']' +returned error code: ?\d+"),
] ]
def on_authorize(self, passwd=None): def on_authorize(self, passwd=None):
if self._get_prompt().endswith('#'): if self._get_prompt().endswith('#'):
return return
cmd = {'command': 'enable'} cmd = {u'command': u'enable'}
if passwd: if passwd:
cmd['prompt'] = r"[\r\n]?password:$" cmd['prompt'] = to_text(r"[\r\n]?password: $", errors='surrogate_or_strict')
cmd['answer'] = passwd cmd['answer'] = passwd
try: try:
self._exec_cli_command(json.dumps(cmd)) self._exec_cli_command(to_bytes(json.dumps(cmd), errors='surrogate_or_strict'))
except AnsibleConnectionFailure: except AnsibleConnectionFailure:
raise AnsibleConnectionFailure('unable to elevate privilege to enable mode') raise AnsibleConnectionFailure('unable to elevate privilege to enable mode')
# in dellos6 the terminal settings are accepted after the privilege mode # in dellos6 the terminal settings are accepted after the privilege mode
try: try:
self._exec_cli_command('terminal length 0') self._exec_cli_command(b'terminal length 0')
except AnsibleConnectionFailure: except AnsibleConnectionFailure:
raise AnsibleConnectionFailure('unable to set terminal parameters') raise AnsibleConnectionFailure('unable to set terminal parameters')
@ -65,9 +66,9 @@ class TerminalModule(TerminalBase):
# if prompt is None most likely the terminal is hung up at a prompt # if prompt is None most likely the terminal is hung up at a prompt
return return
if prompt.strip().endswith(')#'): if prompt.strip().endswith(b')#'):
self._exec_cli_command('end') self._exec_cli_command(b'end')
self._exec_cli_command('disable') self._exec_cli_command(b'disable')
elif prompt.endswith('#'): elif prompt.endswith(b'#'):
self._exec_cli_command('disable') self._exec_cli_command(b'disable')