mirror of https://github.com/ansible/ansible.git
* Ansible 2.3 feature support for dellos6.
- With the new Ansible 2.3 infra changes, the dellos modules doesn't work
(the new infra changes are not backward compatible), so added the below
changes support it.
- Added the new terminal plugin for DellOS6
- Added the new action plugin for DellOS6
- Modified the modules to work with the new infra.
- with that it adds support for DellOS6 Persistent Connection support.
* Remove pep8 confirming files from dellos6.py and dellos6_config legacy-files
(cherry picked from commit a0344acd78)
pull/23172/head
John R Barker
8 years ago
committed by
GitHub
parent
7afc9ac899
commit
1ba7e6b6f6
@ -0,0 +1,120 @@
|
|||||||
|
# 2016 Red Hat Inc.
|
||||||
|
#
|
||||||
|
# This file is part of Ansible
|
||||||
|
#
|
||||||
|
# Ansible is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Ansible is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
from __future__ import (absolute_import, division, print_function)
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import copy
|
||||||
|
|
||||||
|
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||||
|
from ansible.utils.path import unfrackpath
|
||||||
|
from ansible.plugins import connection_loader
|
||||||
|
from ansible.module_utils.six import iteritems
|
||||||
|
from ansible.module_utils.dellos6 import dellos6_argument_spec
|
||||||
|
from ansible.module_utils.basic import AnsibleFallbackNotFound
|
||||||
|
from ansible.module_utils._text import to_bytes
|
||||||
|
|
||||||
|
try:
|
||||||
|
from __main__ import display
|
||||||
|
except ImportError:
|
||||||
|
from ansible.utils.display import Display
|
||||||
|
display = Display()
|
||||||
|
|
||||||
|
|
||||||
|
class ActionModule(_ActionModule):
|
||||||
|
|
||||||
|
def run(self, tmp=None, task_vars=None):
|
||||||
|
if self._play_context.connection != 'local':
|
||||||
|
return dict(
|
||||||
|
failed=True,
|
||||||
|
msg='invalid connection specified, expected connection=local, '
|
||||||
|
'got %s' % self._play_context.connection
|
||||||
|
)
|
||||||
|
|
||||||
|
provider = self.load_provider()
|
||||||
|
|
||||||
|
pc = copy.deepcopy(self._play_context)
|
||||||
|
pc.connection = 'network_cli'
|
||||||
|
pc.network_os = 'dellos6'
|
||||||
|
pc.port = provider['port'] or self._play_context.port or 22
|
||||||
|
pc.remote_user = provider['username'] or self._play_context.connection_user
|
||||||
|
pc.password = provider['password'] or self._play_context.password
|
||||||
|
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
|
||||||
|
pc.timeout = provider['timeout'] or self._play_context.timeout
|
||||||
|
pc.become = provider['authorize'] or False
|
||||||
|
pc.become_pass = provider['auth_pass']
|
||||||
|
|
||||||
|
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
|
||||||
|
|
||||||
|
socket_path = self._get_socket_path(pc)
|
||||||
|
display.vvvv('socket_path: %s' % socket_path, pc.remote_addr)
|
||||||
|
|
||||||
|
if not os.path.exists(socket_path):
|
||||||
|
# start the connection if it isn't started
|
||||||
|
rc, out, err = connection.exec_command('open_shell()')
|
||||||
|
if not rc == 0:
|
||||||
|
return {'failed': True, 'msg': 'unable to open shell', 'rc': rc}
|
||||||
|
else:
|
||||||
|
# make sure we are in the right cli context which should be
|
||||||
|
# enable mode and not config module
|
||||||
|
rc, out, err = connection.exec_command('prompt()')
|
||||||
|
while str(out).strip().endswith(')#'):
|
||||||
|
display.debug('wrong context, sending exit to device')
|
||||||
|
connection.exec_command('exit')
|
||||||
|
rc, out, err = connection.exec_command('prompt()')
|
||||||
|
|
||||||
|
task_vars['ansible_socket'] = socket_path
|
||||||
|
|
||||||
|
if self._play_context.become_method == 'enable':
|
||||||
|
self._play_context.become = False
|
||||||
|
self._play_context.become_method = None
|
||||||
|
return super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
|
def _get_socket_path(self, play_context):
|
||||||
|
ssh = connection_loader.get('ssh', class_only=True)
|
||||||
|
cp = ssh._create_control_path(play_context.remote_addr, play_context.port, play_context.remote_user)
|
||||||
|
path = unfrackpath("$HOME/.ansible/pc")
|
||||||
|
return cp % dict(directory=path)
|
||||||
|
|
||||||
|
def load_provider(self):
|
||||||
|
provider = self._task.args.get('provider', {})
|
||||||
|
for key, value in iteritems(dellos6_argument_spec):
|
||||||
|
if key != 'provider' and key not in provider:
|
||||||
|
if key in self._task.args:
|
||||||
|
provider[key] = self._task.args[key]
|
||||||
|
elif 'fallback' in value:
|
||||||
|
provider[key] = self._fallback(value['fallback'])
|
||||||
|
elif key not in provider:
|
||||||
|
provider[key] = None
|
||||||
|
return provider
|
||||||
|
|
||||||
|
def _fallback(self, fallback):
|
||||||
|
strategy = fallback[0]
|
||||||
|
args = []
|
||||||
|
kwargs = {}
|
||||||
|
|
||||||
|
for item in fallback[1:]:
|
||||||
|
if isinstance(item, dict):
|
||||||
|
kwargs = item
|
||||||
|
else:
|
||||||
|
args = item
|
||||||
|
try:
|
||||||
|
return strategy(*args, **kwargs)
|
||||||
|
except AnsibleFallbackNotFound:
|
||||||
|
pass
|
||||||
@ -0,0 +1,73 @@
|
|||||||
|
# 2016 Red Hat Inc.
|
||||||
|
#
|
||||||
|
# This file is part of Ansible
|
||||||
|
#
|
||||||
|
# Ansible is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Ansible is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
from __future__ import (absolute_import, division, print_function)
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
|
import re
|
||||||
|
import json
|
||||||
|
|
||||||
|
from ansible.plugins.terminal import TerminalBase
|
||||||
|
from ansible.errors import AnsibleConnectionFailure
|
||||||
|
|
||||||
|
|
||||||
|
class TerminalModule(TerminalBase):
|
||||||
|
|
||||||
|
terminal_stdout_re = [
|
||||||
|
re.compile(r"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"),
|
||||||
|
re.compile(r"\[\w+\@[\w\-\.]+(?: [^\]])\] ?[>#\$] ?$")
|
||||||
|
]
|
||||||
|
|
||||||
|
terminal_stderr_re = [
|
||||||
|
re.compile(r"% ?Error: (?:(?!\bdoes not exist\b)(?!\balready exists\b)(?!\bHost not found\b)(?!\bnot active\b).)*$"),
|
||||||
|
re.compile(r"% ?Bad secret"),
|
||||||
|
re.compile(r"invalid input", re.I),
|
||||||
|
re.compile(r"(?:incomplete|ambiguous) command", re.I),
|
||||||
|
re.compile(r"connection timed out", re.I),
|
||||||
|
re.compile(r"'[^']' +returned error code: ?\d+"),
|
||||||
|
]
|
||||||
|
|
||||||
|
def on_authorize(self, passwd=None):
|
||||||
|
if self._get_prompt().endswith('#'):
|
||||||
|
return
|
||||||
|
|
||||||
|
cmd = {'command': 'enable'}
|
||||||
|
if passwd:
|
||||||
|
cmd['prompt'] = r"[\r\n]?password:$"
|
||||||
|
cmd['answer'] = passwd
|
||||||
|
try:
|
||||||
|
self._exec_cli_command(json.dumps(cmd))
|
||||||
|
except AnsibleConnectionFailure:
|
||||||
|
raise AnsibleConnectionFailure('unable to elevate privilege to enable mode')
|
||||||
|
# in dellos6 the terminal settings are accepted after the privilege mode
|
||||||
|
try:
|
||||||
|
self._exec_cli_command('terminal length 0')
|
||||||
|
except AnsibleConnectionFailure:
|
||||||
|
raise AnsibleConnectionFailure('unable to set terminal parameters')
|
||||||
|
|
||||||
|
def on_deauthorize(self):
|
||||||
|
prompt = self._get_prompt()
|
||||||
|
if prompt is None:
|
||||||
|
# if prompt is None most likely the terminal is hung up at a prompt
|
||||||
|
return
|
||||||
|
|
||||||
|
if prompt.strip().endswith(')#'):
|
||||||
|
self._exec_cli_command('end')
|
||||||
|
self._exec_cli_command('disable')
|
||||||
|
|
||||||
|
elif prompt.endswith('#'):
|
||||||
|
self._exec_cli_command('disable')
|
||||||
Loading…
Reference in New Issue