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 EBA3E1FF15C for ; Fri, 19 Sep 2025 11:41:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 982FC1289D; Fri, 19 Sep 2025 11:42:04 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Fri, 19 Sep 2025 11:41:16 +0200 Message-ID: <20250919094122.73373-5-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250919094122.73373-1-g.goller@proxmox.com> References: <20250919094122.73373-1-g.goller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1758274878467 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 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 Subject: [pve-devel] [PATCH ve-rs 4/4] tests: always prepend the frr delimiter/comment "!" to the block X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" In pve-network we always prepend the "!" delimiter/comment to blocks in the frr config. Change to prepend in the templates as well so that we don't have any duplicate "!!" in the config where rust and perl generated config meet. Signed-off-by: Gabriel Goller --- .../fabric/snapshots/fabric__openfabric_default_pve.snap | 2 +- .../fabric/snapshots/fabric__openfabric_default_pve1.snap | 2 +- .../snapshots/fabric__openfabric_dualstack_pve.snap | 8 ++++---- .../snapshots/fabric__openfabric_ipv6_only_pve.snap | 2 +- .../snapshots/fabric__openfabric_multi_fabric_pve1.snap | 2 +- .../tests/fabric/snapshots/fabric__ospf_default_pve.snap | 2 +- .../tests/fabric/snapshots/fabric__ospf_default_pve1.snap | 2 +- .../fabric/snapshots/fabric__ospf_multi_fabric_pve1.snap | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve.snap index 98eb50415e36..052a3f7e501c 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve.snap @@ -3,6 +3,7 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router openfabric uwu net 49.0001.1921.6800.2008.00 exit @@ -31,4 +32,3 @@ route-map pve_openfabric permit 100 exit ! ip protocol openfabric route-map pve_openfabric -! diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve1.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve1.snap index 4453ac49377f..f456e819098a 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve1.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_default_pve1.snap @@ -3,6 +3,7 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router openfabric uwu net 49.0001.1921.6800.2009.00 exit @@ -30,4 +31,3 @@ route-map pve_openfabric permit 100 exit ! ip protocol openfabric route-map pve_openfabric -! diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_dualstack_pve.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_dualstack_pve.snap index 48ac9092045e..89435b23bf53 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_dualstack_pve.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_dualstack_pve.snap @@ -3,25 +3,26 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router openfabric uwu net 49.0001.1921.6800.2008.00 exit ! interface dummy_uwu - ipv6 router openfabric uwu ip router openfabric uwu + ipv6 router openfabric uwu openfabric passive exit ! interface ens19 - ipv6 router openfabric uwu ip router openfabric uwu + ipv6 router openfabric uwu openfabric hello-interval 4 exit ! interface ens20 - ipv6 router openfabric uwu ip router openfabric uwu + ipv6 router openfabric uwu openfabric hello-interval 4 openfabric hello-multiplier 50 exit @@ -43,4 +44,3 @@ exit ip protocol openfabric route-map pve_openfabric ! ipv6 protocol openfabric route-map pve_openfabric6 -! diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_ipv6_only_pve.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_ipv6_only_pve.snap index d7ab1d7e2a61..89d788c9bc7e 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_ipv6_only_pve.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_ipv6_only_pve.snap @@ -3,6 +3,7 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router openfabric uwu net 49.0001.0000.0000.000a.00 exit @@ -31,4 +32,3 @@ route-map pve_openfabric6 permit 100 exit ! ipv6 protocol openfabric route-map pve_openfabric6 -! diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_multi_fabric_pve1.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_multi_fabric_pve1.snap index ad6c6db8eb8b..5e0c18eb2493 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_multi_fabric_pve1.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__openfabric_multi_fabric_pve1.snap @@ -3,6 +3,7 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router openfabric test1 net 49.0001.1921.6800.2009.00 exit @@ -46,4 +47,3 @@ route-map pve_openfabric permit 110 exit ! ip protocol openfabric route-map pve_openfabric -! diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve.snap index a303f31f3d1a..ee47866edd67 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve.snap @@ -3,6 +3,7 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router ospf ospf router-id 10.10.10.1 exit @@ -29,4 +30,3 @@ route-map pve_ospf permit 100 exit ! ip protocol ospf route-map pve_ospf -! diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve1.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve1.snap index 46c30b22abdf..209f3406757b 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve1.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_default_pve1.snap @@ -3,6 +3,7 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router ospf ospf router-id 10.10.10.2 exit @@ -25,4 +26,3 @@ route-map pve_ospf permit 100 exit ! ip protocol ospf route-map pve_ospf -! diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_multi_fabric_pve1.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_multi_fabric_pve1.snap index 1d2a7c3c272d..225d60bf7edb 100644 --- a/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_multi_fabric_pve1.snap +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__ospf_multi_fabric_pve1.snap @@ -3,6 +3,7 @@ source: proxmox-ve-config/tests/fabric/main.rs expression: output snapshot_kind: text --- +! router ospf ospf router-id 192.168.1.9 exit @@ -42,4 +43,3 @@ route-map pve_ospf permit 110 exit ! ip protocol ospf route-map pve_ospf -! -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel