From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id D31BB1FF0AF for ; Fri, 20 Nov 2026 15:25:29 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 91C0C217B5; Fri, 20 Nov 2026 15:25:27 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH network] sdn: fabrics: only warn about a host vrf on a fabric interface Date: Fri, 20 Nov 2026 15:25:17 +0100 Message-ID: <20261120142518.201252-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795184721933 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.222 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: RJ2D2RV6GCZXJ32U4UJ4IQARBI43QXXF X-Message-ID-Hash: RJ2D2RV6GCZXJ32U4UJ4IQARBI43QXXF X-MailFrom: g.goller@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 CC: Thomas Lamprecht X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: A vrf set on a fabric interface made the whole SDN network config of the node fail, so zones and other fabrics were not updated either. Print a warning instead. Note that this does not resolve the vrf conflict, this means that the `interface` config has a different vrf entry than the `interfaces.d/sdn` config. The `interfaces` config runs before, so it wins and the interface will never be added to the fabric vrf. Suggested-by: Thomas Lamprecht Signed-off-by: Gabriel Goller --- src/PVE/Network/SDN/Fabrics.pm | 5 +++-- src/test/run_test_fabric_host_vrf.pl | 12 ++---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm index c3a3a8111537..1b1cce3114db 100644 --- a/src/PVE/Network/SDN/Fabrics.pm +++ b/src/PVE/Network/SDN/Fabrics.pm @@ -10,6 +10,7 @@ use PVE::Exception qw(raise_param_exc); use PVE::JSONSchema qw(get_standard_option); use PVE::INotify; use PVE::ParseUtils qw($IPV4RE); +use PVE::RESTEnvironment qw(log_warn); use PVE::Network::SDN::Formats; use PVE::Network::SDN::PrefixLists; @@ -292,8 +293,8 @@ sub generate_etc_network_config { my $ifaces = PVE::INotify::read_file('interfaces')->{ifaces}; for my $iface (sort keys %$ifaces) { next if !$ifaces->{$iface}->{vrf}; - die "interface '$iface' - cannot set VRF '$ifaces->{$iface}->{vrf}' on an interface that" - . " is part of a fabric, remove the VRF from the host interface\n" + log_warn("interface '$iface' - cannot set VRF '$ifaces->{$iface}->{vrf}' on an" + . " interface that is part of a fabric, remove the VRF from the host interface") if $fabric_object->is_fabric_interface($nodename, $iface); } diff --git a/src/test/run_test_fabric_host_vrf.pl b/src/test/run_test_fabric_host_vrf.pl index 9ed3f2579d34..730255a988e5 100755 --- a/src/test/run_test_fabric_host_vrf.pl +++ b/src/test/run_test_fabric_host_vrf.pl @@ -42,11 +42,7 @@ $inotify->mock( $interfaces = { ens19 => { vrf => 'vrf_blue' } }; eval { PVE::Network::SDN::Fabrics::generate_etc_network_config($running_cfg) }; -like( - $@, - qr/^interface 'ens19' - cannot set VRF 'vrf_blue' on an interface that is part of a fabric/, - 'VRF on a fabric interface fails', -); +is($@, '', 'VRF on a fabric interface does not fail'); $interfaces = { ens20 => { vrf => 'vrf_blue' }, ens19 => {} }; my $config = eval { PVE::Network::SDN::Fabrics::generate_etc_network_config($running_cfg) }; @@ -84,10 +80,6 @@ like( $interfaces = { ens19 => { vrf => 'vrf_red' } }; eval { PVE::Network::SDN::Fabrics::generate_etc_network_config($zone_cfg) }; -like( - $@, - qr/^interface 'ens19' - cannot set VRF 'vrf_red'/, - 'host VRF on a zone fabric interface fails', -); +is($@, '', 'host VRF on a zone fabric interface does not fail'); done_testing(); -- 2.47.3