diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-07-02 17:23:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-02 17:23:21 +0300 |
| commit | bf64dbd6a2fc006e29814cda59cfac6506978b44 (patch) | |
| tree | d4655b06e0c9976a5ecdeae87205e944e098c7b9 /data/templates | |
| parent | 063e007a5a8eac3bb9ad101206dc94734eeaa595 (diff) | |
| parent | 0d3ac22b95cef90e7c54ef823c00bb59b935c158 (diff) | |
| download | vyos-1x-bf64dbd6a2fc006e29814cda59cfac6506978b44.tar.gz vyos-1x-bf64dbd6a2fc006e29814cda59cfac6506978b44.zip | |
Merge pull request #5167 from davi2367/zbf-vrf
firewall: T8761: Reintroduce VRF-interface names in generated config
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/firewall/nftables-zone.j2 | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/data/templates/firewall/nftables-zone.j2 b/data/templates/firewall/nftables-zone.j2 index 7b4128082..45804c9d1 100644 --- a/data/templates/firewall/nftables-zone.j2 +++ b/data/templates/firewall/nftables-zone.j2 @@ -9,9 +9,14 @@ {% for zone_name, zone_conf in zone.items() %} {% if 'local_zone' not in zone_conf %} {% if 'interface' in zone_conf.member %} - oifname { {{ zone_conf.member.interface | quoted_join(',') }} } counter jump VZONE_{{ zone_name }} + oifname { {{ zone_conf.member.interface | quoted_join(",") }} } counter jump VZONE_{{ zone_name }} {% endif %} {% if 'vrf' in zone_conf.member %} +{% for vrf_name in zone_conf.member.vrf %} +{% if zone_conf.vrf_interfaces[vrf_name] | length > 0 %} + oifname { {{ zone_conf.vrf_interfaces[vrf_name] | quoted_join(",") }} } counter jump VZONE_{{ zone_name }} +{% endif %} +{% endfor %} oifname { {{ zone_conf.member.vrf | quoted_join(",") }} } counter jump VZONE_{{ zone_name }} {% endif %} {% endif %} @@ -71,6 +76,12 @@ oifname { {{ zone[from_zone].member.interface | quoted_join(",") }} } counter return {% endif %} {% if 'vrf' in zone[from_zone].member %} +{% for vrf_name in zone[from_zone].member.vrf %} +{% if zone[from_zone]['vrf_interfaces'][vrf_name] | length > 0 %} + oifname { {{ zone[from_zone].vrf_interfaces[vrf_name] | quoted_join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }} + oifname { {{ zone[from_zone].vrf_interfaces[vrf_name] | quoted_join(",") }} } counter return +{% endif %} +{% endfor %} oifname { {{ zone[from_zone].member.vrf | quoted_join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }} oifname { {{ zone[from_zone].member.vrf | quoted_join(",") }} } counter return {% endif %} @@ -84,9 +95,13 @@ {% endif %} {% if 'vrf' in zone[from_zone].member %} {% for vrf_name in zone[from_zone].member.vrf %} - oifname { "{{ zone[from_zone]['vrf_interfaces'][vrf_name] }}" } counter jump NAME{{ suffix }}_{{ from_conf[fw_name] }} - oifname { "{{ zone[from_zone]['vrf_interfaces'][vrf_name] }}" } counter return +{% if zone[from_zone]['vrf_interfaces'][vrf_name] | length > 0 %} + oifname { {{ zone[from_zone].vrf_interfaces[vrf_name] | quoted_join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf[fw_name] }} + oifname { {{ zone[from_zone].vrf_interfaces[vrf_name] | quoted_join(",") }} } counter return +{% endif %} {% endfor %} + oifname { {{ zone[from_zone].member.vrf | quoted_join(",") }} } counter jump NAME{{ suffix }}_{{ from_conf.firewall[fw_name] }} + oifname { {{ zone[from_zone].member.vrf | quoted_join(",") }} } counter return {% endif %} {% endfor %} {% endif %} |