cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "eos_config: Added fix for bug #54400 - support for !! in config mode (#63694)" (#66591)

Browse source 
This actually breaks iosxr_config, revert for now to make tests passing
again.

This reverts commit 7ddf7474d3.
This commit is contained in:
Paul Belanger 2020-01-18 14:22:26 -05:00 committed by GitHub
parent 5db00a05b6
commit f46af19702
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/module_utils/network/common/config.py
View file

@ -164,6 +164,7 @@ class NetworkConfig(object):
self._indent = indent self._indent = indent
self._items = list() self._items = list()
self._config_text = None self._config_text = None
if ignore_lines: if ignore_lines:
for item in ignore_lines: for item in ignore_lines:
if not isinstance(item, Pattern): if not isinstance(item, Pattern):
@ -219,16 +220,15 @@ class NetworkConfig(object):
config = list() config = list()
indents = [0] indents = [0]
for linenum, line in enumerate(to_native(lines, errors='surrogate_or_strict').split('\n')): for linenum, line in enumerate(to_native(lines, errors='surrogate_or_strict').split('\n')):
text = entry_reg.sub('', line).strip() text = entry_reg.sub('', line).strip()
cfg = ConfigLine(line) cfg = ConfigLine(line)
if not text or ignore_line(text, comment_tokens): if not text or ignore_line(text, comment_tokens):
# To accomodate !! comments in config mode continue
if "!!" in text:
pass
else:
continue
# handle top level commands # handle top level commands
if toplevel.match(line): if toplevel.match(line):
ancestors = [cfg] ancestors = [cfg]
@ -377,6 +377,7 @@ class NetworkConfig(object):
expanded.append(p) expanded.append(p)
expanded.append(item) expanded.append(item)
visited.add(item.line) visited.add(item.line)
return expanded return expanded
def add(self, lines, parents=None): def add(self, lines, parents=None):

1
test/integration/targets/eos_config/templates/basic/cmds.j2
View file

@ -1,5 +1,4 @@
ip access-list test ip access-list test
!! Adding comment
10 permit ip host 192.168.0.2 host 192.168.0.1 10 permit ip host 192.168.0.2 host 192.168.0.1
20 permit ip host 192.168.0.1 host 192.168.0.2 20 permit ip host 192.168.0.1 host 192.168.0.2
! !