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 732891FF13F for ; Thu, 12 Mar 2026 11:07:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3DCACD196; Thu, 12 Mar 2026 11:07:52 +0100 (CET) Date: Thu, 12 Mar 2026 11:07:49 +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: 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> <3625d394-bf3f-4d78-aa14-3970bd70fe2f@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <3625d394-bf3f-4d78-aa14-3970bd70fe2f@proxmox.com> User-Agent: NeoMutt/20241002-35-39f9a6 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773310033594 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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: SZ3HZ5N2KJLIPDHJ27HEYIF7FTUASBVH X-Message-ID-Hash: SZ3HZ5N2KJLIPDHJ27HEYIF7FTUASBVH 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:44, 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 > > --- > > [..] > > > /// A match statement inside a route-map. > > /// > > /// A route-map has one or more match statements which decide on which routes the route-map will > > /// execute its actions. If we match on an IP, there are two different syntaxes: `match ip ...` or > > /// `match ipv6 ...`. > > -/// > > -/// Serializes to: > > -/// > > -/// ```text > > -/// match ip address > > -/// ! or > > -/// match ip next-hop > > -/// ! or > > -/// match ipv6 address > > -/// ! or > > -/// match ipv6 next-hop > > -/// ``` > > -#[derive(Clone, Debug, PartialEq, Eq)] > > +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] > > +#[serde(tag = "protocol_type")] > ^ > > pub enum RouteMapMatch { > > + #[serde(rename = "ip")] > > V4(RouteMapMatchInner), > > + #[serde(rename = "ipv6")] > > V6(RouteMapMatchInner), > > + Vni(u32), > > we don't use this yet, but we can't inject a `protocol_type` field into > a `u32`. We probably need some kind of wrapper struct > ``` > pub struct VniMatch { > pub vni: u32, > } > ``` > ? not sure if there's a better way I think this is good, as `serde(value = )` won't work. I also needed a rename on the `Vni` variant :) Thanks for the review! > [..]