wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

module_utils_fix_dellos6 (#28060)

Browse source 
(cherry picked from commit adc533804a)
This commit is contained in:
abirami-n 2017-09-12 22:54:36 +05:30 committed by Toshio Kuratomi
parent c92f44a806
commit 3483040a17
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -159,7 +159,7 @@ def os6_parse(lines, indent=None, comment_tokens=None):
re.compile(r'support-assist.*$'),
re.compile(r'template.*$'),
re.compile(r'address-family.*$'),
re.compile(r'spanning-tree mst.*$'),
re.compile(r'spanning-tree mst configuration.*$'),
re.compile(r'logging.*$'),
re.compile(r'(radius-server|tacacs-server) host.*$')]
@ -205,7 +205,7 @@ def os6_parse(lines, indent=None, comment_tokens=None):
if parent:
cfg._parents.extend(parent)
parent = list()
config.append(cfg)
config.append(cfg)
# handle sublevel children
elif parent_match is False and len(parent) > 0:
if not children:
@ -231,7 +231,11 @@ class Dellos6NetworkConfig(NetworkConfig):
for item in self.items:
if str(item) == "exit":
for diff_item in diff:
if item._parents == diff_item._parents:
if diff_item._parents:
if item._parents == diff_item._parents:
diff.append(item)
break
else:
diff.append(item)
break
elif item not in other:

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

@ -48,7 +48,7 @@ class TerminalModule(TerminalBase):
cmd = {u'command': u'enable'}
if passwd:
cmd[u'prompt'] = to_text(r"[\r\n]?password: $", errors='surrogate_or_strict')
cmd[u'prompt'] = to_text(r"[\r\n]?password:$", errors='surrogate_or_strict')
cmd[u'answer'] = passwd
try:
self._exec_cli_command(to_bytes(json.dumps(cmd), errors='surrogate_or_strict'))