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 9D5DD1FF140 for ; Fri, 27 Mar 2026 12:17:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ED75A6EC2; Fri, 27 Mar 2026 12:17:57 +0100 (CET) Message-ID: <81dee47c-a774-4d2c-bb14-26da2fc3eb1c@proxmox.com> Date: Fri, 27 Mar 2026 12:17:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox-ve-rs 4/9] frr-templates: change route maps template to adapt to new types To: Hannes Laimer , pve-devel@lists.proxmox.com References: <20260325094142.174364-1-s.hanreich@proxmox.com> <20260325094142.174364-7-s.hanreich@proxmox.com> Content-Language: en-US From: Stefan Hanreich In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.710 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 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: KRBLEZ2N7ABFWAF3TJUC3AAUQC6TYUMY X-Message-ID-Hash: KRBLEZ2N7ABFWAF3TJUC3AAUQC6TYUMY X-MailFrom: s.hanreich@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 3/27/26 12:00 PM, Hannes Laimer wrote: > On 2026-03-25 10:41, Stefan Hanreich wrote: >> Instead of defining every potential match / set type manually under a >> different name, proxmox-frr now uses the Adjacently tagged >> representation for representing key/value pairs for match/set actions. >> This allows simplifying the route_maps template by simply rendering >> the respective key / value fields. >> >> Signed-off-by: Stefan Hanreich >> --- >> proxmox-frr-templates/templates/route_maps.jinja | 12 ++++-------- >> 1 file changed, 4 insertions(+), 8 deletions(-) >> >> diff --git a/proxmox-frr-templates/templates/route_maps.jinja b/proxmox-frr-templates/templates/route_maps.jinja >> index 172c682..19a6ee4 100644 >> --- a/proxmox-frr-templates/templates/route_maps.jinja >> +++ b/proxmox-frr-templates/templates/route_maps.jinja >> @@ -3,16 +3,12 @@ >> ! >> route-map {{ name }} {{ routemap.action }} {{ routemap.seq }} >> {% for match in routemap.matches %} >> -{% if match.value.list_type == "prefixlist" %} >> - match {{ match.protocol_type }} {{ match.match_type }} prefix-list {{ match.value.list_name }} >> -{% elif match.value.list_type == "accesslist" %} >> - match {{ match.protocol_type }} {{ match.match_type }} {{ match.value.list_name }} >> -{% elif match.match_type == "next-hop" %} >> - match {{ match.protocol_type }} next-hop {{ match.value }} >> -{% endif %} >> + match {{ match.key }} {% if match.value is defined %} {{ match.value }} {% endif %} > ^ > I think the space after `match.key`(and before `endif`) is too much, frr > doesn't really care, but still > ``` > - match {{ match.key }} {% if match.value is defined %} {{ match.value > }} {% endif %} > + match {{ match.key }}{% if match.value is defined %} {{ match.value > }}{% endif %} The resulting route maps come out fine on my test cluster (with only one space) - I'll check more closely nevertheless!