From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AA7C21FF13F for ; Thu, 12 Mar 2026 11:03:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F2C8CCE4F; Thu, 12 Mar 2026 11:03:16 +0100 (CET) Date: Thu, 12 Mar 2026 11:03:13 +0100 From: Gabriel Goller To: Hannes Laimer Subject: Re: [PATCH proxmox-ve-rs v5 2/8] frr: add proxmox-frr-templates package that contains templates Message-ID: <5pbgyygxkpwevyndqzzvonu4ucgevsqfmpvva5ayspxzby4drx@ept7ebjcza7x> Mail-Followup-To: Hannes Laimer , pve-devel@lists.proxmox.com References: <20260310120705.150425-1-g.goller@proxmox.com> <20260310120705.150425-3-g.goller@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20241002-35-39f9a6 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773309757326 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.045 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.408 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.819 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.903 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: S4PY346H45ARZJNSHSAUBOH3EJJCUAYL X-Message-ID-Hash: S4PY346H45ARZJNSHSAUBOH3EJJCUAYL X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: pve-devel@lists.proxmox.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 12.03.2026 09:01, Hannes Laimer wrote: > On 2026-03-10 13:09, Gabriel Goller wrote: > > This debian package contains the jinja template files used to generate > > the frr config. Currently only the fabrics template files are here, the > > rest will be added in later commits. When installing this package the > > templates will be installed to `/usr/share/proxmox-frr/templates/`. > > `proxmox-frr` will then use `include_str!` to embed the templates into > > the binary. > > > > This package will only be published to the `devel` channel. > > > > Co-authored-by: Stefan Hanreich > > Signed-off-by: Gabriel Goller > > --- > > [..] > > > diff --git a/proxmox-frr-templates/templates/interface.jinja b/proxmox-frr-templates/templates/interface.jinja > > new file mode 100644 > > index 000000000000..c3c3b6c3526f > > --- /dev/null > > +++ b/proxmox-frr-templates/templates/interface.jinja > > @@ -0,0 +1,9 @@ > > +{% macro interface(name, addresses) %} > > +! > > +interface {{ name }} > > +{% for address in addresses %} > > + ip address {{address}} > > I think we have to split v4 and v6 addresses cause FRR wants > `ipv6 address ...` for v6 addresses Ah right. This is never used anywhere because the ip address is written by ifupdown and not frr. Instead of address being a Vec I converted it to two fields addresses_ipv4 and addresses_ipv6 holding Vec. Thanks for the review! > > +{% endfor %} > > +{{ caller() -}} > > +exit > > +{% endmacro %} > > diff --git a/proxmox-frr-templates/templates/ospfd.jinja b/proxmox-frr-templates/templates/ospfd.jinja > > new file mode 100644 > > index 000000000000..8f9e76390f75 > > --- /dev/null > > +++ b/proxmox-frr-templates/templates/ospfd.jinja > > @@ -0,0 +1,18 @@ > > +{% from "interface.jinja" import interface %} > > +{% if ospf.router %} > > +! > > +router ospf > > + ospf router-id {{ ospf.router.router_id }} > > +exit > > +{% endif %} > > +{% for interface_name, interface_config in ospf.interfaces|items %} > > +{% call interface(interface_name, interface_config.addresses) %} > > + ip ospf area {{ interface_config.area }} > > +{% if interface_config.passive %} > > + ip ospf passive > > +{% endif %} > > +{% if interface_config.network_type %} > > + ip ospf network {{ interface_config.network_type }} > > +{% endif %} > > +{% endcall %} > > +{% endfor %} > > [..] > > > +exit > > +{% endfor %} > > +{% endfor %} >