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 5A96C63532 for ; Tue, 25 Aug 2020 07:21:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5547E22D30 for ; Tue, 25 Aug 2020 07:21:01 +0200 (CEST) Received: from mailpro.odiso.net (mailpro.odiso.net [89.248.211.110]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 890EA22CFB for ; Tue, 25 Aug 2020 07:20:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 69EA715B9E32; Tue, 25 Aug 2020 07:20:56 +0200 (CEST) Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ohQNyzHVIBlw; Tue, 25 Aug 2020 07:20:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 511C615B9EA5; Tue, 25 Aug 2020 07:20:56 +0200 (CEST) X-Virus-Scanned: amavisd-new at mailpro.odiso.com Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id JEnkZZaqo-z9; Tue, 25 Aug 2020 07:20:56 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id 227AE15B9EA0; Tue, 25 Aug 2020 07:20:56 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 25 Aug 2020 07:02:07 +0200 Message-Id: <20200825050222.12447-4-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200825050222.12447-1-aderumier@odiso.com> References: <20200825050222.12447-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vnets.pm, subnets.pm, subnetplugin.pm, vnetplugin.pm] Subject: [pve-devel] [PATCH v6 pve-network 03/18] add subnets verifications hooks 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, 25 Aug 2020 05:21:01 -0000 --- PVE/API2/Network/SDN/Subnets.pm | 5 ++++- PVE/API2/Network/SDN/Vnets.pm | 9 +++++++-- PVE/Network/SDN/SubnetPlugin.pm | 15 +++++++++++++++ PVE/Network/SDN/VnetPlugin.pm | 8 +++++--- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/PVE/API2/Network/SDN/Subnets.pm b/PVE/API2/Network/SDN/Subne= ts.pm index 26b2aa5..3ef1d11 100644 --- a/PVE/API2/Network/SDN/Subnets.pm +++ b/PVE/API2/Network/SDN/Subnets.pm @@ -9,6 +9,7 @@ use PVE::Cluster qw(cfs_read_file cfs_write_file); use PVE::Network::SDN; use PVE::Network::SDN::Subnets; use PVE::Network::SDN::SubnetPlugin; +use PVE::Network::SDN::Vnets; =20 use Storable qw(dclone); use PVE::JSONSchema qw(get_standard_option); @@ -204,9 +205,11 @@ __PACKAGE__->register_method ({ =20 my $scfg =3D PVE::Network::SDN::Subnets::sdn_subnets_config($cfg, $id)= ; =20 - my $subnet_cfg =3D PVE::Network::SDN::Subnets::config(); + my $subnets_cfg =3D PVE::Network::SDN::Subnets::config(); + my $vnets_cfg =3D PVE::Network::SDN::Vnets::config(); =20 delete $cfg->{ids}->{$id}; + PVE::Network::SDN::SubnetPlugin->on_delete_hook($id, $subnets_cfg, $vn= ets_cfg); PVE::Network::SDN::Subnets::write_config($cfg); PVE::Network::SDN::increase_version(); =20 diff --git a/PVE/API2/Network/SDN/Vnets.pm b/PVE/API2/Network/SDN/Vnets.p= m index c5860c8..23bc8bb 100644 --- a/PVE/API2/Network/SDN/Vnets.pm +++ b/PVE/API2/Network/SDN/Vnets.pm @@ -11,6 +11,7 @@ use PVE::Network::SDN::Zones; use PVE::Network::SDN::Zones::Plugin; use PVE::Network::SDN::Vnets; use PVE::Network::SDN::VnetPlugin; +use PVE::Network::SDN::Subnets; =20 use Storable qw(dclone); use PVE::JSONSchema qw(get_standard_option); @@ -132,7 +133,9 @@ __PACKAGE__->register_method ({ my $plugin =3D PVE::Network::SDN::Zones::Plugin->lookup($plugin_con= fig->{type}); $plugin->verify_tag($opts->{tag}); =20 - PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg); + my $subnet_cfg =3D PVE::Network::SDN::Subnets::config(); + + PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg, $subnet_cf= g); =20 PVE::Network::SDN::Vnets::write_config($cfg); PVE::Network::SDN::increase_version(); @@ -173,7 +176,9 @@ __PACKAGE__->register_method ({ my $plugin =3D PVE::Network::SDN::Zones::Plugin->lookup($plugin_con= fig->{type}); $plugin->verify_tag($opts->{tag}); =20 - PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg); + my $subnet_cfg =3D PVE::Network::SDN::Subnets::config(); + + PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg, $subnet_cf= g); =20 PVE::Network::SDN::Vnets::write_config($cfg); PVE::Network::SDN::increase_version(); diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/PVE/Network/SDN/SubnetPlug= in.pm index 8900681..1b790a6 100644 --- a/PVE/Network/SDN/SubnetPlugin.pm +++ b/PVE/Network/SDN/SubnetPlugin.pm @@ -112,4 +112,19 @@ sub on_update_hook { raise_param_exc({ gateway =3D> "$gateway is not in subnet $subnet"})= if $gateway && !$subnet_matcher->($gateway); } =20 +sub on_delete_hook { + my ($class, $subnetid, $subnet_cfg, $vnet_cfg) =3D @_; + + #verify if vnets have subnet + foreach my $id (keys %{$vnet_cfg->{ids}}) { + my $vnet =3D $vnet_cfg->{ids}->{$id}; + my @subnets =3D PVE::Tools::split_list($vnet->{subnets}) if $vnet->{sub= nets}; + foreach my $subnet (@subnets) { + raise_param_exc({ subnet =3D> "$subnet is attached to vnet $id"}) i= f $subnet eq $subnetid; + } + } + + return; +} + 1; diff --git a/PVE/Network/SDN/VnetPlugin.pm b/PVE/Network/SDN/VnetPlugin.p= m index 47ca50b..430b3bf 100644 --- a/PVE/Network/SDN/VnetPlugin.pm +++ b/PVE/Network/SDN/VnetPlugin.pm @@ -111,10 +111,12 @@ sub on_update_hook { } } } - #verify subnet - my $subnets =3D $vnet_cfg->{ids}->{$vnetid}->{subnets}; - my @subnets =3D PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->= {subnets}) if $plugin_config->{'peers'}; =20 + #verify subnet + my @subnets =3D PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->= {subnets}) if $vnet_cfg->{ids}->{$vnetid}->{subnets}; + foreach my $subnet (@subnets) { + raise_param_exc({ subnet =3D> "$subnet not existing"}) if !$subnet_cfg-= >{ids}->{$subnet}; + } } =20 1; --=20 2.20.1