summaryrefslogtreecommitdiff
path: root/plugins/module_utils
diff options
context:
space:
mode:
authorRuben van Dijk <15885455+RubenNL@users.noreply.github.com>2025-10-26 11:29:10 +0100
committerGitHub <noreply@github.com>2025-10-26 06:29:10 -0400
commitfa3414e786d4df0c1f074207094ca776e26250b5 (patch)
treeb6175011a5d23e82ff8da33f55f7973a333dee97 /plugins/module_utils
parenteb2bb1c77fc5c1bfd82049afb67400d706724660 (diff)
downloadvyos.vyos-fa3414e786d4df0c1f074207094ca776e26250b5.tar.gz
vyos.vyos-fa3414e786d4df0c1f074207094ca776e26250b5.zip
[T7856] Fix confusion between firewall zone name and group name. (#436)
Co-authored-by: Gaige B Paulsen <gaige@cluetrust.com>
Diffstat (limited to 'plugins/module_utils')
-rw-r--r--plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py b/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py
index a46f8563..3a48889e 100644
--- a/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py
+++ b/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py
@@ -179,7 +179,7 @@ class Firewall_globalFacts(object):
if policies:
rules_lst = []
for sp in set(policies):
- sp_regex = r" %s .+$" % sp
+ sp_regex = r"^set firewall (?:global-options )?state-policy %s .+$" % sp
cfg = "\n".join(findall(sp_regex, conf, M))
obj = self.parse_policies(cfg, sp)
obj["connection_type"] = sp
@@ -233,7 +233,7 @@ class Firewall_globalFacts(object):
if groups:
rules_lst = []
for gr in set(groups):
- gr_regex = r" %s .+$" % gr
+ gr_regex = r"^set firewall group " + type + " %s .+$" % gr
cfg = "\n".join(findall(gr_regex, conf, M))
if "ipv6" in type:
# fmt: off