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

Added fix for bug # 54400

Browse source
This commit is contained in:
gosriniv 2019-10-18 13:36:18 -04:00
parent 348c164a14
commit bf42db4269
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,6 @@ 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):
@ -221,15 +220,16 @@ 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
if "!!" in text:
pass
else:
continue continue
# handle top level commands # handle top level commands
if toplevel.match(line): if toplevel.match(line):
ancestors = [cfg] ancestors = [cfg]
@ -378,7 +378,6 @@ 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,4 +1,5 @@
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
! !