40ddbe026d
* Fixes #18663. Bad handling of existing config in dellos9 module. The dellos9 module doesn't build correctly the internal structures used to represent the existing config of the managed network device. This leads to apply changes every time the playbook is run, even if the existing config is the same that the one you are trying to push into the device. Probably this problem exist also in the dellos6 and dellos10 modules, but I only fixed it in the dellos9 module. The fix modifies two methods. The first one is `get_config`, where the return clause didn't work correctly when the flow doesn't enter in the `if` block. In that case the `contents` variable is not an array an this should be handled. The second fix is in the `get_sublevel_config` method. In this case the indentation whitespaces of the parents should be rebuild because further functions and methods required it to handle correctly comparisons used to check if changes should be pushed into device. * Fixes #18663 for dellos10 module with the same patches as dellos9.
127 lines
4.3 KiB
Python
127 lines
4.3 KiB
Python
#
|
|
# (c) 2015 Peter Sprygada, <psprygada@ansible.com>
|
|
#
|
|
# Copyright (c) 2016 Dell Inc.
|
|
#
|
|
# This code is part of Ansible, but is an independent component.
|
|
# This particular file snippet, and this file snippet only, is BSD licensed.
|
|
# Modules you write using this snippet, which is embedded dynamically by Ansible
|
|
# still belong to the author of the module, and may assign their own license
|
|
# to the complete work.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without modification,
|
|
# are permitted provided that the following conditions are met:
|
|
#
|
|
# * Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# * Redistributions in binary form must reproduce the above copyright notice,
|
|
# this list of conditions and the following disclaimer in the documentation
|
|
# and/or other materials provided with the distribution.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
|
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
|
|
import re
|
|
|
|
from ansible.module_utils.network import register_transport, to_list
|
|
from ansible.module_utils.shell import CliBase
|
|
from ansible.module_utils.netcfg import NetworkConfig, ConfigLine
|
|
|
|
|
|
def get_config(module):
|
|
contents = module.params['config']
|
|
|
|
if not contents:
|
|
contents = module.config.get_config()
|
|
module.params['config'] = contents
|
|
return NetworkConfig(indent=1, contents=contents[0])
|
|
else:
|
|
return NetworkConfig(indent=1, contents=contents)
|
|
|
|
|
|
def get_sublevel_config(running_config, module):
|
|
contents = list()
|
|
current_config_contents = list()
|
|
obj = running_config.get_object(module.params['parents'])
|
|
if obj:
|
|
contents = obj.children
|
|
contents[:0] = module.params['parents']
|
|
|
|
indent = 0
|
|
for c in contents:
|
|
if isinstance(c, str):
|
|
current_config_contents.append(c.rjust(len(c) + indent, ' '))
|
|
if isinstance(c, ConfigLine):
|
|
current_config_contents.append(c.raw)
|
|
indent = indent + 1
|
|
sublevel_config = '\n'.join(current_config_contents)
|
|
|
|
return sublevel_config
|
|
|
|
|
|
class Cli(CliBase):
|
|
|
|
NET_PASSWD_RE = re.compile(r"[\r\n]?password:\s?$", re.I)
|
|
|
|
CLI_PROMPTS_RE = [
|
|
re.compile(r"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:#) ?$"),
|
|
re.compile(r"\[\w+\@[\w\-\.]+(?: [^\]])\] ?[>#\$] ?$")
|
|
]
|
|
|
|
CLI_ERRORS_RE = [
|
|
re.compile(r"% ?Error"),
|
|
re.compile(r"% ?Bad secret"),
|
|
re.compile(r"Syntax error:"),
|
|
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"[^\r\n]+ not found", re.I),
|
|
re.compile(r"'[^']' +returned error code: ?\d+"),
|
|
]
|
|
|
|
|
|
def connect(self, params, **kwargs):
|
|
super(Cli, self).connect(params, kickstart=False, **kwargs)
|
|
self.shell.send('terminal length 0')
|
|
|
|
|
|
def configure(self, commands, **kwargs):
|
|
cmds = ['configure terminal']
|
|
cmds.extend(to_list(commands))
|
|
cmds.append('end')
|
|
cmds.append('commit')
|
|
|
|
responses = self.execute(cmds)
|
|
responses.pop(0)
|
|
return responses
|
|
|
|
|
|
def get_config(self, **kwargs):
|
|
return self.execute(['show running-configuration'])
|
|
|
|
|
|
def load_config(self, commands, **kwargs):
|
|
return self.configure(commands)
|
|
|
|
|
|
def commit_config(self, **kwargs):
|
|
self.execute(['commit'])
|
|
|
|
|
|
def abort_config(self, **kwargs):
|
|
self.execute(['discard'])
|
|
|
|
|
|
def save_config(self):
|
|
self.execute(['copy running-config startup-config'])
|
|
|
|
|
|
Cli = register_transport('cli', default=True)(Cli)
|