From a5737e30af4c1cf12b91f9c79f42d2ff7387272c Mon Sep 17 00:00:00 2001 From: Oscar Ekeroth Date: Fri, 9 Aug 2024 10:59:24 +0200 Subject: [PATCH] delete lines which only delete candidate config is no longer ignored. --- changelogs/fragments/config_delete_filter.yaml | 2 ++ plugins/modules/junos_config.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/config_delete_filter.yaml diff --git a/changelogs/fragments/config_delete_filter.yaml b/changelogs/fragments/config_delete_filter.yaml new file mode 100644 index 00000000..0fbb0de3 --- /dev/null +++ b/changelogs/fragments/config_delete_filter.yaml @@ -0,0 +1,2 @@ +bugfixes: + - In junos_config, "delete" lines which only delete candidate config lines are no longer ignored. diff --git a/plugins/modules/junos_config.py b/plugins/modules/junos_config.py index c019e9c2..75f4bcb1 100644 --- a/plugins/modules/junos_config.py +++ b/plugins/modules/junos_config.py @@ -363,8 +363,20 @@ def filter_delete_statements(module, candidate): config = to_native(match.text, encoding="latin-1") modified_candidate = candidate[:] - for index, line in reversed(list(enumerate(candidate))): - if line.startswith("delete"): + for index, line in list(enumerate(candidate)): + if not line.startswith("delete"): + continue + re_match_set = re.compile("^set" + re.escape(line[6:]) + "($| )") + # Remove candidate set config lines which are later removed. + for index2 in range(0, index): + if re_match_set.match(candidate[index2]): + # We can't just remove the element, that would mess up the indexing. + modified_candidate[index2] = None + + for index, line in reversed(list(enumerate(modified_candidate))): + if line is None: + del modified_candidate[index] + elif line.startswith("delete"): newline = re.sub("^delete", "set", line) if newline not in config: del modified_candidate[index]