From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 73748A05F0 for ; Tue, 13 Jun 2023 13:22:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4BB522EAB5 for ; Tue, 13 Jun 2023 13:21:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Jun 2023 13:21:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6874A44E01 for ; Tue, 13 Jun 2023 13:21:35 +0200 (CEST) Date: Tue, 13 Jun 2023 13:21:28 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20230612174347.1598994-1-aderumier@odiso.com> <20230612174347.1598994-3-aderumier@odiso.com> In-Reply-To: <20230612174347.1598994-3-aderumier@odiso.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1686654818.t42m6hi7zz.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.072 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH pve-network 2/2] zones: status: add a special message if vnet is not generated 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: , X-List-Received-Date: Tue, 13 Jun 2023 11:22:07 -0000 On June 12, 2023 7:43 pm, Alexandre Derumier wrote: > if vnet has not been generated (this should never happend) > warn the user to check if "source /etc/network/interfaces.d/sdn' > exist >=20 > Signed-off-by: Alexandre Derumier > --- > src/PVE/Network/SDN/Zones.pm | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/src/PVE/Network/SDN/Zones.pm b/src/PVE/Network/SDN/Zones.pm > index 7d70e49..e26e21f 100644 > --- a/src/PVE/Network/SDN/Zones.pm > +++ b/src/PVE/Network/SDN/Zones.pm > @@ -267,7 +267,11 @@ sub status { > my $err_msg =3D $plugin->status($plugin_config, $zone, $id, $vnet, $sta= tus); > if (@{$err_msg} > 0) { > $vnet_status->{$id}->{status} =3D 'error'; > - $vnet_status->{$id}->{statusmsg} =3D join(',', @{$err_msg}); > + if (grep(/^missing ${id}$/, @$err_msg)) { > + $vnet_status->{$id}->{statusmsg} =3D "vnet $id is not generated. Do yo= u have included 'source /etc/network/interfaces.d/sdn' ?"; these 'missing XXX' messages are generated by us in the plugins, so if we want to expand them, we should do that where we generate them instead of matching here. what do you think about the following (in addition, or instead of changing the 'statusmsg' contents): diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm index 1ad85e5..8623fb8 100644 --- a/src/PVE/Network/SDN.pm +++ b/src/PVE/Network/SDN.pm @@ -6,6 +6,8 @@ use warnings; use Data::Dumper; use JSON; =20 +use PVE::INotify; + use PVE::Network::SDN::Vnets; use PVE::Network::SDN::Zones; use PVE::Network::SDN::Controllers; @@ -208,6 +210,16 @@ sub get_local_vnets { =20 sub generate_zone_config { my $raw_config =3D PVE::Network::SDN::Zones::generate_etc_network_conf= ig(); + + if ($raw_config) { + eval { + my $net_cfg =3D PVE::INotify::read_file('interfaces', 1); + my $opts =3D $net_cfg->{data}->{options}; + warn "missing 'source /etc/network/interfaces.d/sdn' directive for SD= N support!\n" + if ! grep { $_->[1] =3D~ m!^source /etc/network/interfaces.d/(:?sdn|\*)!= } @$opts; + }; + warn "Failed to read network interfaces definition - $@\n" if $@; + } PVE::Network::SDN::Zones::write_etc_network_config($raw_config); } the check is not 100% reliable (i.e., there could be a wildcard but slightly different format) unfortunately. > + } else { > + $vnet_status->{$id}->{statusmsg} =3D join(',', @{$err_msg}); > + } > $zone_status->{$zone}->{status} =3D 'error'; > } > } > --=20 > 2.30.2 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20