Added fix for bug # 54400

pull/63694/head
gosriniv 5 years ago
parent 348c164a14
commit bf42db4269

@ -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,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
! !

Loading…
Cancel
Save