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 C4A3E1FF15C for ; Fri, 19 Sep 2025 11:41:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 022E7125F0; Fri, 19 Sep 2025 11:41:35 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Fri, 19 Sep 2025 11:41:18 +0200 Message-ID: <20250919094122.73373-7-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: 1758274878549 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 network 2/4] sdn: add trailing newline in frr config 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" Add trailing newline to the end of frr config, it looks better this way. Signed-off-by: Gabriel Goller --- src/PVE/Network/SDN/Frr.pm | 2 +- .../zones/evpn/advertise_subnets/expected_controller_config | 2 +- .../evpn/disable_arp_nd_suppression/expected_controller_config | 2 +- src/test/zones/evpn/ebgp/expected_controller_config | 2 +- src/test/zones/evpn/ebgp_loopback/expected_controller_config | 2 +- src/test/zones/evpn/exitnode/expected_controller_config | 2 +- .../evpn/exitnode_local_routing/expected_controller_config | 2 +- src/test/zones/evpn/exitnode_primary/expected_controller_config | 2 +- src/test/zones/evpn/exitnode_snat/expected_controller_config | 2 +- .../zones/evpn/exitnodenullroute/expected_controller_config | 2 +- src/test/zones/evpn/ipv4/expected_controller_config | 2 +- src/test/zones/evpn/ipv4ipv6/expected_controller_config | 2 +- .../zones/evpn/ipv4ipv6nogateway/expected_controller_config | 2 +- src/test/zones/evpn/ipv6/expected_controller_config | 2 +- src/test/zones/evpn/ipv6underlay/expected_controller_config | 2 +- src/test/zones/evpn/isis/expected_controller_config | 2 +- src/test/zones/evpn/isis_loopback/expected_controller_config | 2 +- src/test/zones/evpn/isis_standalone/expected_controller_config | 2 +- src/test/zones/evpn/multipath_relax/expected_controller_config | 2 +- src/test/zones/evpn/multiplezones/expected_controller_config | 2 +- .../zones/evpn/openfabric_fabric/expected_controller_config | 2 +- src/test/zones/evpn/ospf_fabric/expected_controller_config | 2 +- src/test/zones/evpn/rt_import/expected_controller_config | 2 +- src/test/zones/evpn/vxlanport/expected_controller_config | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index 32ea37d813fb..ff46b6631328 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -222,7 +222,7 @@ sub raw_config_to_string { push @final_config, @$raw_config; push @final_config, ( - "!", "line vty", "!", + "!", "line vty", "!", "", ); return join("\n", @final_config); diff --git a/src/test/zones/evpn/advertise_subnets/expected_controller_config b/src/test/zones/evpn/advertise_subnets/expected_controller_config index 40d08465b1e2..08e47e86a2ec 100644 --- a/src/test/zones/evpn/advertise_subnets/expected_controller_config +++ b/src/test/zones/evpn/advertise_subnets/expected_controller_config @@ -54,4 +54,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config index 4b5d628b65e2..5458aa17b854 100644 --- a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config +++ b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config @@ -41,4 +41,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config index 1629a2deb454..410e8af3e7b8 100644 --- a/src/test/zones/evpn/ebgp/expected_controller_config +++ b/src/test/zones/evpn/ebgp/expected_controller_config @@ -58,4 +58,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config index fc8901de6173..2358937ffbf6 100644 --- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -70,4 +70,4 @@ exit ip protocol bgp route-map correct_src ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config index 02bb7609431b..631f3acd7b62 100644 --- a/src/test/zones/evpn/exitnode/expected_controller_config +++ b/src/test/zones/evpn/exitnode/expected_controller_config @@ -74,4 +74,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config index 96fb26d6a80f..3da3a79a44b3 100644 --- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -60,4 +60,4 @@ exit ip route 10.0.0.0/24 10.255.255.2 xvrf_myzone ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config index 7ea32db093cf..d3d3da37803b 100644 --- a/src/test/zones/evpn/exitnode_primary/expected_controller_config +++ b/src/test/zones/evpn/exitnode_primary/expected_controller_config @@ -76,4 +76,4 @@ route-map MAP_VTEP_OUT permit 3 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config index 02bb7609431b..631f3acd7b62 100644 --- a/src/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config @@ -74,4 +74,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config index a36da27ca756..6b9fc01e67c8 100644 --- a/src/test/zones/evpn/exitnodenullroute/expected_controller_config +++ b/src/test/zones/evpn/exitnodenullroute/expected_controller_config @@ -117,4 +117,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config index 4b5d628b65e2..5458aa17b854 100644 --- a/src/test/zones/evpn/ipv4/expected_controller_config +++ b/src/test/zones/evpn/ipv4/expected_controller_config @@ -41,4 +41,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config index 4b5d628b65e2..5458aa17b854 100644 --- a/src/test/zones/evpn/ipv4ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6/expected_controller_config @@ -41,4 +41,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config index 4b5d628b65e2..5458aa17b854 100644 --- a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config @@ -41,4 +41,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config index 4b5d628b65e2..5458aa17b854 100644 --- a/src/test/zones/evpn/ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv6/expected_controller_config @@ -41,4 +41,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ipv6underlay/expected_controller_config b/src/test/zones/evpn/ipv6underlay/expected_controller_config index d7c693a2e213..7b9d73784482 100644 --- a/src/test/zones/evpn/ipv6underlay/expected_controller_config +++ b/src/test/zones/evpn/ipv6underlay/expected_controller_config @@ -41,4 +41,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config index efe2d43cd583..77499476570e 100644 --- a/src/test/zones/evpn/isis/expected_controller_config +++ b/src/test/zones/evpn/isis/expected_controller_config @@ -54,4 +54,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config index b9d9c2969421..4cdfb9354c8d 100644 --- a/src/test/zones/evpn/isis_loopback/expected_controller_config +++ b/src/test/zones/evpn/isis_loopback/expected_controller_config @@ -55,4 +55,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config index bab5ec9119a2..0739cb5e1b3a 100644 --- a/src/test/zones/evpn/isis_standalone/expected_controller_config +++ b/src/test/zones/evpn/isis_standalone/expected_controller_config @@ -18,4 +18,4 @@ router isis isis1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config index 7dff84cdd057..a72c48167161 100644 --- a/src/test/zones/evpn/multipath_relax/expected_controller_config +++ b/src/test/zones/evpn/multipath_relax/expected_controller_config @@ -53,4 +53,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/multiplezones/expected_controller_config b/src/test/zones/evpn/multiplezones/expected_controller_config index 849d36a07e35..f7df034c5c34 100644 --- a/src/test/zones/evpn/multiplezones/expected_controller_config +++ b/src/test/zones/evpn/multiplezones/expected_controller_config @@ -51,4 +51,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config index cff540311c8b..ad13359b23d4 100644 --- a/src/test/zones/evpn/openfabric_fabric/expected_controller_config +++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config @@ -70,4 +70,4 @@ ip protocol openfabric route-map pve_openfabric ! ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config index fd3651e1275c..c124c3aa33c7 100644 --- a/src/test/zones/evpn/ospf_fabric/expected_controller_config +++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config @@ -64,4 +64,4 @@ ip protocol ospf route-map pve_ospf ! ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config index a4c0c6605d70..8dc74560e66c 100644 --- a/src/test/zones/evpn/rt_import/expected_controller_config +++ b/src/test/zones/evpn/rt_import/expected_controller_config @@ -47,4 +47,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! diff --git a/src/test/zones/evpn/vxlanport/expected_controller_config b/src/test/zones/evpn/vxlanport/expected_controller_config index 4b5d628b65e2..5458aa17b854 100644 --- a/src/test/zones/evpn/vxlanport/expected_controller_config +++ b/src/test/zones/evpn/vxlanport/expected_controller_config @@ -41,4 +41,4 @@ route-map MAP_VTEP_OUT permit 1 exit ! line vty -! \ No newline at end of file +! -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel