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 476C91FF13F for ; Thu, 12 Mar 2026 11:13:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 67B14DE89; Thu, 12 Mar 2026 11:13:01 +0100 (CET) Date: Thu, 12 Mar 2026 11:11:54 +0100 From: Gabriel Goller To: Hannes Laimer Subject: Re: [PATCH proxmox-ve-rs v5 5/8] frr: add template serializer and serialize fabrics using templates Message-ID: <5qqkxgzaawlydn6f6xanwlttyqepwtq3y24o2gloqbwwvnv4db@jzl33jegdllc> Mail-Followup-To: Hannes Laimer , pve-devel@lists.proxmox.com References: <20260310120705.150425-1-g.goller@proxmox.com> <20260310120705.150425-6-g.goller@proxmox.com> <2df3d021-8f8d-47de-889a-57c91142a63f@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <2df3d021-8f8d-47de-889a-57c91142a63f@proxmox.com> User-Agent: NeoMutt/20241002-35-39f9a6 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773310278423 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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: SM3LY5MFRILVQYRFLVQDDBIR2FTQ5KEH X-Message-ID-Hash: SM3LY5MFRILVQYRFLVQDDBIR2FTQ5KEH 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 10:12, Hannes Laimer wrote: > On 2026-03-10 13:08, Gabriel Goller wrote: > > Add a new serializer which uses only the builtin (include_str!) templates from > > the `proxmox-frr-templates` package in `/usr/share/proxmox-frr/templates` to > > generate the frr config file. Also update the `build_fabric` function and the > > tests accordingly. > > > > Use the `phf` crate to store them in a const map. > > > > Signed-off-by: Gabriel Goller > > --- > > [..] > > > #[derive(Error, Debug)] > > pub enum FrrWordError { > > #[error("word is empty")] > > @@ -113,7 +25,7 @@ pub enum FrrWordError { > > /// > > /// Every string argument or value in FRR is an FrrWord. FrrWords must only contain ascii > > /// characters and must not have a whitespace. > > -#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] > > +#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] > > this would skip validation, we probably want something like > ``` > #[serde(try_from = "String")] > ``` > instead of the `Deserialize` The deserialize only happens when moving the rust config to perl and back, so we don't really need to validate here, but nevertheless added it. I used forward_deserialize_to_from_str!(FrrWord); from proxmox-serde. Thanks for the review! > > pub struct FrrWord(String); > > > > impl FrrWord { > > @@ -144,12 +56,6 @@ impl FromStr for FrrWord { > > } > > } > > > > -impl Display for FrrWord { > > - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { > > - self.0.fmt(f) > > - } > > -} > > - > > impl AsRef for FrrWord { > > fn as_ref(&self) -> &str { > > &self.0 > > @@ -157,7 +63,7 @@ impl AsRef for FrrWord { > > } > > > > [..]