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 5641063B9D for ; Mon, 5 Oct 2020 17:09:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 71ECA1CA78 for ; Mon, 5 Oct 2020 17:09:27 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 773BA1C777 for ; Mon, 5 Oct 2020 17:09:14 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 4FE0AE899F; Mon, 5 Oct 2020 17:09:14 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 5 Oct 2020 17:09:05 +0200 Message-Id: <20201005150912.463000-29-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201005150912.463000-1-aderumier@odiso.com> References: <20201005150912.463000-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.433 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.248 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.398 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 Subject: [pve-devel] [PATCH v10 pve-network 28/35] small bugfixes 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: Mon, 05 Oct 2020 15:09:29 -0000 Signed-off-by: Alexandre Derumier --- PVE/API2/Network/SDN/Dns.pm | 2 +- PVE/Network/SDN/Controllers.pm | 2 +- PVE/Network/SDN/Ipams/PVEPlugin.pm | 6 +++--- PVE/Network/SDN/Subnets.pm | 4 ++-- PVE/Network/SDN/Vnets.pm | 2 +- PVE/Network/SDN/Zones.pm | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PVE/API2/Network/SDN/Dns.pm b/PVE/API2/Network/SDN/Dns.pm index ea26af3..3d08552 100644 --- a/PVE/API2/Network/SDN/Dns.pm +++ b/PVE/API2/Network/SDN/Dns.pm @@ -147,7 +147,7 @@ __PACKAGE__->register_method ({ $dns_cfg->{ids}->{$id} = $opts; - my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($scfg->{type}); + my $plugin = PVE::Network::SDN::Dns::Plugin->lookup($opts->{type}); $plugin->on_update_hook($opts); PVE::Network::SDN::Dns::write_config($dns_cfg); diff --git a/PVE/Network/SDN/Controllers.pm b/PVE/Network/SDN/Controllers.pm index c210516..f652d7f 100644 --- a/PVE/Network/SDN/Controllers.pm +++ b/PVE/Network/SDN/Controllers.pm @@ -55,7 +55,7 @@ sub lock_sdn_controllers_config { sub sdn_controllers_ids { my ($cfg) = @_; - return keys %{$cfg->{ids}}; + return sort keys %{$cfg->{ids}}; } sub complete_sdn_controller { diff --git a/PVE/Network/SDN/Ipams/PVEPlugin.pm b/PVE/Network/SDN/Ipams/PVEPlugin.pm index 741a680..a3ad3d6 100644 --- a/PVE/Network/SDN/Ipams/PVEPlugin.pm +++ b/PVE/Network/SDN/Ipams/PVEPlugin.pm @@ -56,7 +56,7 @@ sub del_subnet { my $db = read_db(); my $ips = $db->{subnets}->{$cidr}->{ips}; - die "can't delete subnet, not empty" if keys %{$ips} > 0; + die "can't delete subnet $cidr , not empty" if keys %{$ips} > 0; delete $db->{subnets}->{$cidr}; write_db($db); }); @@ -74,7 +74,7 @@ sub add_ip { my $db = read_db(); my $s = $db->{subnets}->{$cidr}; - die "ip already exist" if defined($s->{ips}->{$ip}); + die "ip $ip already exist" if defined($s->{ips}->{$ip}); #verify that ip is valid for this subnet $s->{ips}->{$ip} = 1; @@ -127,7 +127,7 @@ sub del_ip { my $s = $db->{subnets}->{$cidr}; return if !$ip; - die "ip does not exist in pam" if !defined($s->{ips}->{$ip}); + die "ip $ip does not exist in pam" if !defined($s->{ips}->{$ip}); delete $s->{ips}->{$ip}; write_db($db); }); diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm index 5b99c91..0f14f6f 100644 --- a/PVE/Network/SDN/Subnets.pm +++ b/PVE/Network/SDN/Subnets.pm @@ -37,7 +37,7 @@ sub write_config { sub sdn_subnets_ids { my ($cfg) = @_; - return keys %{$cfg->{ids}}; + return sort keys %{$cfg->{ids}}; } sub complete_sdn_subnet { @@ -191,7 +191,7 @@ sub next_free_ip { sub add_ip { my ($subnetid, $subnet, $ip, $hostname) = @_; - return if !$subnet; + return if !$subnet || !$ip; my $ipamid = $subnet->{ipam}; my $dns = $subnet->{dns}; diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index d45ef2a..96aa422 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -35,7 +35,7 @@ sub write_config { sub sdn_vnets_ids { my ($cfg) = @_; - return keys %{$cfg->{ids}}; + return sort keys %{$cfg->{ids}}; } sub complete_sdn_vnet { diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm index 75f3233..cef4dd2 100644 --- a/PVE/Network/SDN/Zones.pm +++ b/PVE/Network/SDN/Zones.pm @@ -61,7 +61,7 @@ sub write_config { sub sdn_zones_ids { my ($cfg) = @_; - return keys %{$cfg->{ids}}; + return sort keys %{$cfg->{ids}}; } sub complete_sdn_zone { -- 2.20.1