From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A4AA81FF13F for ; Thu, 12 Mar 2026 09:02:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AE74C7BB5; Thu, 12 Mar 2026 09:02:36 +0100 (CET) Message-ID: Date: Thu, 12 Mar 2026 09:01:58 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox-ve-rs v5 2/8] frr: add proxmox-frr-templates package that contains templates To: Gabriel Goller , pve-devel@lists.proxmox.com References: <20260310120705.150425-1-g.goller@proxmox.com> <20260310120705.150425-3-g.goller@proxmox.com> Content-Language: en-US From: Hannes Laimer In-Reply-To: <20260310120705.150425-3-g.goller@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773302483151 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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) 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: FQDI6RD2EKC6PL76E3J2KLZT6VMNMZRI X-Message-ID-Hash: FQDI6RD2EKC6PL76E3J2KLZT6VMNMZRI X-MailFrom: h.laimer@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 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 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 > +{% 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 %}