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 BE87D1FF13F for ; Thu, 12 Mar 2026 09:45:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D0D12A546; Thu, 12 Mar 2026 09:45:19 +0100 (CET) Message-ID: <3625d394-bf3f-4d78-aa14-3970bd70fe2f@proxmox.com> Date: Thu, 12 Mar 2026 09:44:45 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox-ve-rs v5 5/8] frr: add template serializer and serialize fabrics using templates To: Gabriel Goller , pve-devel@lists.proxmox.com References: <20260310120705.150425-1-g.goller@proxmox.com> <20260310120705.150425-6-g.goller@proxmox.com> Content-Language: en-US From: Hannes Laimer In-Reply-To: <20260310120705.150425-6-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: 1773305050353 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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: HJZFCUMK2UUBBVRNDPUXSP356MTX4MAX X-Message-ID-Hash: HJZFCUMK2UUBBVRNDPUXSP356MTX4MAX 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: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 > } > [..]