firewall: T4333: migrate to new vyos_defined Jinja2 test

1 files changed, 7 insertions, 7 deletions

diff --git a/data/templates/firewall/nftables-defines.tmpl b/data/templates/firewall/nftables-defines.tmpl
index d9eb7c199..66d31093b 100644
--- a/data/templates/firewall/nftables-defines.tmpl
+++ b/data/templates/firewall/nftables-defines.tmpl
@@ -1,30 +1,30 @@
-{% if group is defined %}
-{%   if group.address_group is defined %}
+{% if group is vyos_defined %}
+{%   if group.address_group is vyos_defined %}
 {%     for group_name, group_conf in group.address_group.items() %}
 define A_{{ group_name }} = { {{ group_conf.address | join(",") }} }
 {%     endfor %}
 {%   endif %}
-{%   if group.ipv6_address_group is defined %}
+{%   if group.ipv6_address_group is vyos_defined %}
 {%     for group_name, group_conf in group.ipv6_address_group.items() %}
 define A6_{{ group_name }} = { {{ group_conf.address | join(",") }} }
 {%     endfor %}
 {%   endif %}
-{%   if group.mac_group is defined %}
+{%   if group.mac_group is vyos_defined %}
 {%     for group_name, group_conf in group.mac_group.items() %}
 define M_{{ group_name }} = { {{ group_conf.mac_address | join(",") }} }
 {%     endfor %}
 {%   endif %}
-{%   if group.network_group is defined %}
+{%   if group.network_group is vyos_defined %}
 {%     for group_name, group_conf in group.network_group.items() %}
 define N_{{ group_name }} = { {{ group_conf.network | join(",") }} }
 {%     endfor %}
 {%   endif %}
-{%   if group.ipv6_network_group is defined %}
+{%   if group.ipv6_network_group is vyos_defined %}
 {%     for group_name, group_conf in group.ipv6_network_group.items() %}
 define N6_{{ group_name }} = { {{ group_conf.network | join(",") }} }
 {%     endfor %}
 {%   endif %}
-{%   if group.port_group is defined %}
+{%   if group.port_group is vyos_defined %}
 {%     for group_name, group_conf in group.port_group.items() %}
 define P_{{ group_name }} = { {{ group_conf.port | join(",") }} }
 {%     endfor %}