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 BD4276037E for ; Thu, 24 Sep 2020 10:41:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8DE5FE923 for ; Thu, 24 Sep 2020 10:41:17 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD6E0E7CF for ; Thu, 24 Sep 2020 10:41:01 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 5EF6DD685A; Thu, 24 Sep 2020 10:40:55 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 24 Sep 2020 10:40:53 +0200 Message-Id: <20200924084054.611548-25-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200924084054.611548-1-aderumier@odiso.com> References: <20200924084054.611548-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.724 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.249 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.399 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. [ipams.pm, subnets.pm, subnetplugin.pm] Subject: [pve-devel] [PATCH v8 pve-network 24/25] subnet: make ipam not optionnal and use pve ipam as default 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: Thu, 24 Sep 2020 08:41:34 -0000 Signed-off-by: Alexandre Derumier --- PVE/API2/Network/SDN/Subnets.pm | 2 ++ PVE/Network/SDN/Ipams.pm | 2 ++ PVE/Network/SDN/SubnetPlugin.pm | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Network/SDN/Subnets.pm b/PVE/API2/Network/SDN/Subnets.pm index ab4117c..2dd80a3 100644 --- a/PVE/API2/Network/SDN/Subnets.pm +++ b/PVE/API2/Network/SDN/Subnets.pm @@ -182,6 +182,8 @@ __PACKAGE__->register_method ({ my $opts = PVE::Network::SDN::SubnetPlugin->check_config($id, $param, 0, 1); $cfg->{ids}->{$id} = $opts; + raise_param_exc({ ipam => "you can't change ipam"}) if $opts->{ipam} && $scfg->{ipam} && $opts->{ipam} ne $scfg->{ipam}; + PVE::Network::SDN::SubnetPlugin->on_update_hook($id, $opts, $scfg); PVE::Network::SDN::Subnets::write_config($cfg); diff --git a/PVE/Network/SDN/Ipams.pm b/PVE/Network/SDN/Ipams.pm index a979d46..302c4d2 100644 --- a/PVE/Network/SDN/Ipams.pm +++ b/PVE/Network/SDN/Ipams.pm @@ -34,6 +34,8 @@ sub sdn_ipams_config { sub config { my $config = cfs_read_file("sdn/ipams.cfg"); + #add default internal pve + $config->{ids}->{pve}->{type} = 'pve'; return $config; } diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/PVE/Network/SDN/SubnetPlugin.pm index 97d8cb8..341e9e0 100644 --- a/PVE/Network/SDN/SubnetPlugin.pm +++ b/PVE/Network/SDN/SubnetPlugin.pm @@ -109,7 +109,7 @@ sub options { dnszone => { optional => 1 }, reversednszone => { optional => 1 }, dnszoneprefix => { optional => 1 }, - ipam => { optional => 1 }, + ipam => { optional => 0 }, }; } -- 2.20.1