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 6AD6866EEC for ; Sun, 8 Nov 2020 15:20:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE71EEC88 for ; Sun, 8 Nov 2020 15:20:08 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E300E8EF for ; Sun, 8 Nov 2020 15:19:48 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 8083071386B; Sun, 8 Nov 2020 15:19:42 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Sun, 8 Nov 2020 15:19:31 +0100 Message-Id: <20201108141940.1028443-30-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201108141940.1028443-1-aderumier@odiso.com> References: <20201108141940.1028443-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.205 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.276 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [subnetplugin.pm, simpleplugin.pm, faucetplugin.pm, mydomain.com, subnets.pm, vlanplugin.pm, evpnplugin.pm, qinqplugin.pm, zones.pm, vxlanplugin.pm, plugin.pm, vnets.pm] Subject: [pve-devel] [PATCH pve-network 29/38] move ipam option from subnet to zone 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: Sun, 08 Nov 2020 14:20:50 -0000 --- PVE/API2/Network/SDN/Zones.pm | 9 +++++++++ PVE/Network/SDN/SubnetPlugin.pm | 8 +------- PVE/Network/SDN/Subnets.pm | 6 +++--- PVE/Network/SDN/Vnets.pm | 2 +- PVE/Network/SDN/Zones/EvpnPlugin.pm | 1 + PVE/Network/SDN/Zones/FaucetPlugin.pm | 1 + PVE/Network/SDN/Zones/Plugin.pm | 4 ++++ PVE/Network/SDN/Zones/QinQPlugin.pm | 1 + PVE/Network/SDN/Zones/SimplePlugin.pm | 3 ++- PVE/Network/SDN/Zones/VlanPlugin.pm | 1 + PVE/Network/SDN/Zones/VxlanPlugin.pm | 1 + 11 files changed, 25 insertions(+), 12 deletions(-) diff --git a/PVE/API2/Network/SDN/Zones.pm b/PVE/API2/Network/SDN/Zones.pm index cbfa9fe..54f087d 100644 --- a/PVE/API2/Network/SDN/Zones.pm +++ b/PVE/API2/Network/SDN/Zones.pm @@ -88,6 +88,7 @@ __PACKAGE__->register_method ({ dns => { type => 'string', optional => 1}, reversedns => { type => 'string', optional => 1}, dnszone => { type => 'string', optional => 1}, + ipam => { type => 'string', optional => 1}, pending => { optional => 1}, state => { type => 'string', optional => 1}, nodes => { type => 'string', optional => 1}, @@ -217,6 +218,10 @@ __PACKAGE__->register_method ({ raise_param_exc({ reversedns => "$reversednsserver don't exist"}) if $reversednsserver && !$dns_cfg->{ids}->{$reversednsserver}; raise_param_exc({ dnszone => "missing dns server"}) if $dnszone && !$dnsserver; + my $ipam = $opts->{ipam}; + my $ipam_cfg = PVE::Network::SDN::Ipams::config(); + raise_param_exc({ ipam => "$ipam not existing"}) if $ipam && !$ipam_cfg->{ids}->{$ipam}; + $zone_cfg->{ids}->{$id} = $opts; $plugin->on_update_hook($id, $zone_cfg, $controller_cfg); @@ -269,6 +274,10 @@ __PACKAGE__->register_method ({ raise_param_exc({ reversedns => "$reversednsserver don't exist"}) if $reversednsserver && !$dns_cfg->{ids}->{$reversednsserver}; raise_param_exc({ dnszone => "missing dns server"}) if $dnszone && !$dnsserver; + my $ipam = $opts->{ipam}; + my $ipam_cfg = PVE::Network::SDN::Ipams::config(); + raise_param_exc({ ipam => "$ipam not existing"}) if $ipam && !$ipam_cfg->{ids}->{$ipam}; + $plugin->on_update_hook($id, $zone_cfg, $controller_cfg); PVE::Network::SDN::Zones::write_config($zone_cfg); diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/PVE/Network/SDN/SubnetPlugin.pm index f57a5e9..a5d03f6 100644 --- a/PVE/Network/SDN/SubnetPlugin.pm +++ b/PVE/Network/SDN/SubnetPlugin.pm @@ -75,10 +75,6 @@ sub properties { type => 'string', format => 'dns-name', description => "dns domain zone prefix ex: 'adm' -> .adm.mydomain.com", }, - ipam => { - type => 'string', - description => "use a specific ipam", - }, }; } @@ -89,7 +85,6 @@ sub options { # routes => { optional => 1 }, snat => { optional => 1 }, dnszoneprefix => { optional => 1 }, - ipam => { optional => 0 }, }; } @@ -101,7 +96,7 @@ sub on_update_hook { my $vnetid = $subnet->{vnet}; my $gateway = $subnet->{gateway}; - my $ipam = $subnet->{ipam}; + my $ipam = $zone->{ipam}; my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; my $reversedns = $zone->{reversedns}; @@ -121,7 +116,6 @@ sub on_update_hook { if ($ipam) { my $ipam_cfg = PVE::Network::SDN::Ipams::config(); my $plugin_config = $ipam_cfg->{ids}->{$ipam}; - raise_param_exc({ ipam => "$ipam not existing"}) if !$plugin_config; my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type}); $plugin->add_subnet($plugin_config, $subnetid, $subnet); diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm index aa7c6c1..50130d5 100644 --- a/PVE/Network/SDN/Subnets.pm +++ b/PVE/Network/SDN/Subnets.pm @@ -160,7 +160,7 @@ sub next_free_ip { my $cidr = undef; my $ip = undef; - my $ipamid = $subnet->{ipam}; + my $ipamid = $zone->{ipam}; my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; my $reversedns = $zone->{reversedns}; @@ -204,7 +204,7 @@ sub add_ip { return if !$subnet || !$ip; - my $ipamid = $subnet->{ipam}; + my $ipamid = $zone->{ipam}; my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; my $reversedns = $zone->{reversedns}; @@ -246,7 +246,7 @@ sub del_ip { return if !$subnet; - my $ipamid = $subnet->{ipam}; + my $ipamid = $zone->{ipam}; my $dns = $zone->{dns}; my $dnszone = $zone->{dnszone}; my $reversedns = $zone->{reversedns}; diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index 3b49ada..d08db51 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -95,7 +95,7 @@ sub get_next_free_ip { next if $ipversion != Net::IP::ip_get_version($network); $subnetcount++; - if ($subnet->{ipam}) { + if ($zone->{ipam}) { eval { $ip = PVE::Network::SDN::Subnets::next_free_ip($zone, $subnetid, $subnet, $hostname); }; diff --git a/PVE/Network/SDN/Zones/EvpnPlugin.pm b/PVE/Network/SDN/Zones/EvpnPlugin.pm index 3cb083b..723b3cc 100644 --- a/PVE/Network/SDN/Zones/EvpnPlugin.pm +++ b/PVE/Network/SDN/Zones/EvpnPlugin.pm @@ -40,6 +40,7 @@ sub options { dns => { optional => 1 }, reversedns => { optional => 1 }, dnszone => { optional => 1 }, + ipam => { optional => 0 }, }; } diff --git a/PVE/Network/SDN/Zones/FaucetPlugin.pm b/PVE/Network/SDN/Zones/FaucetPlugin.pm index 1b70a57..a9f119c 100644 --- a/PVE/Network/SDN/Zones/FaucetPlugin.pm +++ b/PVE/Network/SDN/Zones/FaucetPlugin.pm @@ -29,6 +29,7 @@ sub options { dns => { optional => 1 }, reversedns => { optional => 1 }, dnszone => { optional => 1 }, + ipam => { optional => 0 }, }; } diff --git a/PVE/Network/SDN/Zones/Plugin.pm b/PVE/Network/SDN/Zones/Plugin.pm index 7f6db0e..1f24269 100644 --- a/PVE/Network/SDN/Zones/Plugin.pm +++ b/PVE/Network/SDN/Zones/Plugin.pm @@ -44,6 +44,10 @@ my $defaultData = { nodes => get_standard_option('pve-node-list', { optional => 1 }), zone => get_standard_option('pve-sdn-zone-id', { completion => \&PVE::Network::SDN::Zones::complete_sdn_zone }), + ipam => { + type => 'string', + description => "use a specific ipam", + }, }, }; diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm index 8507ae6..aadfd27 100644 --- a/PVE/Network/SDN/Zones/QinQPlugin.pm +++ b/PVE/Network/SDN/Zones/QinQPlugin.pm @@ -43,6 +43,7 @@ sub options { dns => { optional => 1 }, reversedns => { optional => 1 }, dnszone => { optional => 1 }, + ipam => { optional => 0 }, }; } diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/PVE/Network/SDN/Zones/SimplePlugin.pm index 58cc1af..fe0f20f 100644 --- a/PVE/Network/SDN/Zones/SimplePlugin.pm +++ b/PVE/Network/SDN/Zones/SimplePlugin.pm @@ -26,7 +26,7 @@ sub properties { dnszone => { type => 'string', format => 'dns-name', description => "dns domain zone ex: mydomain.com", - }, + } }; } @@ -37,6 +37,7 @@ sub options { dns => { optional => 1 }, reversedns => { optional => 1 }, dnszone => { optional => 1 }, + ipam => { optional => 0 }, }; } diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/PVE/Network/SDN/Zones/VlanPlugin.pm index fd750c9..e1ae75b 100644 --- a/PVE/Network/SDN/Zones/VlanPlugin.pm +++ b/PVE/Network/SDN/Zones/VlanPlugin.pm @@ -37,6 +37,7 @@ sub options { dns => { optional => 1 }, reversedns => { optional => 1 }, dnszone => { optional => 1 }, + ipam => { optional => 0 }, }; } diff --git a/PVE/Network/SDN/Zones/VxlanPlugin.pm b/PVE/Network/SDN/Zones/VxlanPlugin.pm index 7a6687a..e8870a0 100644 --- a/PVE/Network/SDN/Zones/VxlanPlugin.pm +++ b/PVE/Network/SDN/Zones/VxlanPlugin.pm @@ -41,6 +41,7 @@ sub options { dns => { optional => 1 }, reversedns => { optional => 1 }, dnszone => { optional => 1 }, + ipam => { optional => 0 }, }; } -- 2.20.1