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 11CAA1FF15C for ; Fri, 19 Sep 2025 11:41:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2FEC6126FB; Fri, 19 Sep 2025 11:41:36 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Fri, 19 Sep 2025 11:41:17 +0200 Message-ID: <20250919094122.73373-6-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: 1758274878529 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 1/4] sdn: remove duplicate comment line '!' 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" The '!' symbol in frr is just a separator/comment and doesn't do anything. We usually add the '!' and the start of a block, so we remove it after the start block. Signed-off-by: Gabriel Goller --- src/PVE/Network/SDN/Frr.pm | 1 - src/test/zones/evpn/advertise_subnets/expected_controller_config | 1 - .../evpn/disable_arp_nd_suppression/expected_controller_config | 1 - src/test/zones/evpn/ebgp/expected_controller_config | 1 - src/test/zones/evpn/ebgp_loopback/expected_controller_config | 1 - src/test/zones/evpn/exitnode/expected_controller_config | 1 - .../zones/evpn/exitnode_local_routing/expected_controller_config | 1 - src/test/zones/evpn/exitnode_primary/expected_controller_config | 1 - src/test/zones/evpn/exitnode_snat/expected_controller_config | 1 - src/test/zones/evpn/exitnodenullroute/expected_controller_config | 1 - src/test/zones/evpn/ipv4/expected_controller_config | 1 - src/test/zones/evpn/ipv4ipv6/expected_controller_config | 1 - src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config | 1 - src/test/zones/evpn/ipv6/expected_controller_config | 1 - src/test/zones/evpn/ipv6underlay/expected_controller_config | 1 - src/test/zones/evpn/isis/expected_controller_config | 1 - src/test/zones/evpn/isis_loopback/expected_controller_config | 1 - src/test/zones/evpn/isis_standalone/expected_controller_config | 1 - src/test/zones/evpn/multipath_relax/expected_controller_config | 1 - src/test/zones/evpn/multiplezones/expected_controller_config | 1 - src/test/zones/evpn/openfabric_fabric/expected_controller_config | 1 - src/test/zones/evpn/ospf_fabric/expected_controller_config | 1 - src/test/zones/evpn/rt_import/expected_controller_config | 1 - src/test/zones/evpn/vxlanport/expected_controller_config | 1 - 24 files changed, 24 deletions(-) diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index b607b32c248d..32ea37d813fb 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -217,7 +217,6 @@ sub raw_config_to_string { "hostname $nodename", "log syslog informational", "service integrated-vtysh-config", - "!", ); push @final_config, @$raw_config; diff --git a/src/test/zones/evpn/advertise_subnets/expected_controller_config b/src/test/zones/evpn/advertise_subnets/expected_controller_config index 6bf36f6ed331..40d08465b1e2 100644 --- a/src/test/zones/evpn/advertise_subnets/expected_controller_config +++ b/src/test/zones/evpn/advertise_subnets/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf 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 8a133a506b52..4b5d628b65e2 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 @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config index 5cf695c97cab..1629a2deb454 100644 --- a/src/test/zones/evpn/ebgp/expected_controller_config +++ b/src/test/zones/evpn/ebgp/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config index 4b44a0702d01..fc8901de6173 100644 --- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config +++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config index 9310d51d61bb..02bb7609431b 100644 --- a/src/test/zones/evpn/exitnode/expected_controller_config +++ b/src/test/zones/evpn/exitnode/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf 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 6735d4d83698..96fb26d6a80f 100644 --- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config +++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config index b2f3b332529b..7ea32db093cf 100644 --- a/src/test/zones/evpn/exitnode_primary/expected_controller_config +++ b/src/test/zones/evpn/exitnode_primary/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config index 9310d51d61bb..02bb7609431b 100644 --- a/src/test/zones/evpn/exitnode_snat/expected_controller_config +++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config index b99c1a1da71a..a36da27ca756 100644 --- a/src/test/zones/evpn/exitnodenullroute/expected_controller_config +++ b/src/test/zones/evpn/exitnodenullroute/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 ip route 10.0.0.0/24 null0 diff --git a/src/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config index 8a133a506b52..4b5d628b65e2 100644 --- a/src/test/zones/evpn/ipv4/expected_controller_config +++ b/src/test/zones/evpn/ipv4/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config index 8a133a506b52..4b5d628b65e2 100644 --- a/src/test/zones/evpn/ipv4ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config index 8a133a506b52..4b5d628b65e2 100644 --- a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config +++ b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config index 8a133a506b52..4b5d628b65e2 100644 --- a/src/test/zones/evpn/ipv6/expected_controller_config +++ b/src/test/zones/evpn/ipv6/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/ipv6underlay/expected_controller_config b/src/test/zones/evpn/ipv6underlay/expected_controller_config index b07791434489..d7c693a2e213 100644 --- a/src/test/zones/evpn/ipv6underlay/expected_controller_config +++ b/src/test/zones/evpn/ipv6underlay/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config index 068b08a09f77..efe2d43cd583 100644 --- a/src/test/zones/evpn/isis/expected_controller_config +++ b/src/test/zones/evpn/isis/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config index 9b3dc449b120..b9d9c2969421 100644 --- a/src/test/zones/evpn/isis_loopback/expected_controller_config +++ b/src/test/zones/evpn/isis_loopback/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config index ce62d74c0d60..bab5ec9119a2 100644 --- a/src/test/zones/evpn/isis_standalone/expected_controller_config +++ b/src/test/zones/evpn/isis_standalone/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! interface eth0 ip router isis isis1 ! diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config index bf2289093b6f..7dff84cdd057 100644 --- a/src/test/zones/evpn/multipath_relax/expected_controller_config +++ b/src/test/zones/evpn/multipath_relax/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/multiplezones/expected_controller_config b/src/test/zones/evpn/multiplezones/expected_controller_config index e1e6df5562e0..849d36a07e35 100644 --- a/src/test/zones/evpn/multiplezones/expected_controller_config +++ b/src/test/zones/evpn/multiplezones/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config index 2c29f3cc4a5f..cff540311c8b 100644 --- a/src/test/zones/evpn/openfabric_fabric/expected_controller_config +++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_evpn vni 100 exit-vrf diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config index 712fc2a9fd4f..fd3651e1275c 100644 --- a/src/test/zones/evpn/ospf_fabric/expected_controller_config +++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_evpn vni 100 exit-vrf diff --git a/src/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config index 4de7f89f82c8..a4c0c6605d70 100644 --- a/src/test/zones/evpn/rt_import/expected_controller_config +++ b/src/test/zones/evpn/rt_import/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf diff --git a/src/test/zones/evpn/vxlanport/expected_controller_config b/src/test/zones/evpn/vxlanport/expected_controller_config index 8a133a506b52..4b5d628b65e2 100644 --- a/src/test/zones/evpn/vxlanport/expected_controller_config +++ b/src/test/zones/evpn/vxlanport/expected_controller_config @@ -4,7 +4,6 @@ hostname localhost log syslog informational service integrated-vtysh-config ! -! vrf vrf_myzone vni 1000 exit-vrf -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel