diff --git a/lib/ansible/module_utils/network/common/config.py b/lib/ansible/module_utils/network/common/config.py index 3eaa35eb7d0..974d346098b 100644 --- a/lib/ansible/module_utils/network/common/config.py +++ b/lib/ansible/module_utils/network/common/config.py @@ -164,6 +164,7 @@ class NetworkConfig(object): self._indent = indent self._items = list() self._config_text = None + if ignore_lines: for item in ignore_lines: if not isinstance(item, Pattern): @@ -219,16 +220,15 @@ class NetworkConfig(object): config = list() indents = [0] + for linenum, line in enumerate(to_native(lines, errors='surrogate_or_strict').split('\n')): text = entry_reg.sub('', line).strip() cfg = ConfigLine(line) + 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 if toplevel.match(line): ancestors = [cfg] @@ -377,6 +377,7 @@ class NetworkConfig(object): expanded.append(p) expanded.append(item) visited.add(item.line) + return expanded def add(self, lines, parents=None): diff --git a/test/integration/targets/eos_config/templates/basic/cmds.j2 b/test/integration/targets/eos_config/templates/basic/cmds.j2 index ea7ac7f0931..c68cce8e17c 100644 --- a/test/integration/targets/eos_config/templates/basic/cmds.j2 +++ b/test/integration/targets/eos_config/templates/basic/cmds.j2 @@ -1,5 +1,4 @@ ip access-list test -!! Adding comment 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 !