From 04f6db9acd434b1dcd3289c141bf23c6ba43f336 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 5 Jan 2021 10:35:29 +0100 Subject: [PATCH] ipams: add noerr param Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Ipams/NetboxPlugin.pm | 24 +++++++++++------------ PVE/Network/SDN/Ipams/PhpIpamPlugin.pm | 27 +++++++++++++------------- PVE/Network/SDN/Ipams/Plugin.pm | 12 ++++++------ 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/PVE/Network/SDN/Ipams/NetboxPlugin.pm b/PVE/Network/SDN/Ipams/NetboxPlugin.pm index eae2e59..5a03f39 100644 --- a/PVE/Network/SDN/Ipams/NetboxPlugin.pm +++ b/PVE/Network/SDN/Ipams/NetboxPlugin.pm @@ -28,7 +28,7 @@ sub options { # Plugin implementation sub add_subnet { - my ($class, $plugin_config, $subnetid, $subnet) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $noerr) = @_; my $cidr = $subnet->{cidr}; my $gateway = $subnet->{gateway}; @@ -47,14 +47,14 @@ sub add_subnet { my $result = PVE::Network::SDN::api_request("POST", "$url/ipam/prefixes/", $headers, $params); }; if ($@) { - die "error add subnet to ipam: $@"; + die "error add subnet to ipam: $@" if !$noerr; } } } sub del_subnet { - my ($class, $plugin_config, $subnetid, $subnet) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $noerr) = @_; my $cidr = $subnet->{cidr}; my $url = $plugin_config->{url}; @@ -71,13 +71,13 @@ sub del_subnet { PVE::Network::SDN::api_request("DELETE", "$url/ipam/prefixes/$internalid/", $headers); }; if ($@) { - die "error deleting subnet from ipam: $@"; + die "error deleting subnet from ipam: $@" if !$noerr; } } sub add_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $noerr) = @_; my $mask = $subnet->{mask}; my $url = $plugin_config->{url}; @@ -93,12 +93,12 @@ sub add_ip { }; if ($@) { - die "error add subnet ip to ipam: ip already exist: $@"; + die "error add subnet ip to ipam: ip already exist: $@" if !$noerr; } } sub update_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $noerr) = @_; my $mask = $subnet->{mask}; my $url = $plugin_config->{url}; @@ -116,12 +116,12 @@ sub update_ip { PVE::Network::SDN::api_request("PATCH", "$url/ipam/ip-addresses/$ip_id/", $headers, $params); }; if ($@) { - die "error update ip $ip : $@"; + die "error update ip $ip : $@" if !$noerr; } } sub add_next_freeip { - my ($class, $plugin_config, $subnetid, $subnet, $hostname, $mac, $description) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $hostname, $mac, $description, $noerr) = @_; my $cidr = $subnet->{cidr}; @@ -141,14 +141,14 @@ sub add_next_freeip { }; if ($@) { - die "can't find free ip in subnet $cidr: $@"; + die "can't find free ip in subnet $cidr: $@" if !$noerr; } return $ip; } sub del_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $noerr) = @_; return if !$ip; @@ -163,7 +163,7 @@ sub del_ip { PVE::Network::SDN::api_request("DELETE", "$url/ipam/ip-addresses/$ip_id/", $headers); }; if ($@) { - die "error delete ip $ip : $@"; + die "error delete ip $ip : $@" if !$noerr; } } diff --git a/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm b/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm index 235d553..ed66ea9 100644 --- a/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm +++ b/PVE/Network/SDN/Ipams/PhpIpamPlugin.pm @@ -38,7 +38,7 @@ sub options { # Plugin implementation sub add_subnet { - my ($class, $plugin_config, $subnetid, $subnet) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $noerr) = @_; my $cidr = $subnet->{cidr}; my $network = $subnet->{network}; @@ -55,7 +55,6 @@ sub add_subnet { #create subnet if (!$internalid) { - my $params = { subnet => $network, mask => $mask, sectionId => $section, @@ -65,14 +64,14 @@ sub add_subnet { PVE::Network::SDN::api_request("POST", "$url/subnets/", $headers, $params); }; if ($@) { - die "error add subnet to ipam: $@"; + die "error add subnet to ipam: $@" if !$noerr; } } } sub del_subnet { - my ($class, $plugin_config, $subnetid, $subnet) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $noerr) = @_; my $cidr = $subnet->{cidr}; my $url = $plugin_config->{url}; @@ -89,13 +88,13 @@ sub del_subnet { PVE::Network::SDN::api_request("DELETE", "$url/subnets/$internalid", $headers); }; if ($@) { - die "error deleting subnet from ipam: $@"; + die "error deleting subnet from ipam: $@" if !$noerr; } } sub add_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $noerr) = @_; my $cidr = $subnet->{cidr}; my $url = $plugin_config->{url}; @@ -118,12 +117,12 @@ sub add_ip { }; if ($@) { - die "error add subnet ip to ipam: ip $ip already exist: $@"; + die "error add subnet ip to ipam: ip $ip already exist: $@" if !$noerr; } } sub update_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $noerr) = @_; my $cidr = $subnet->{cidr}; my $url = $plugin_config->{url}; @@ -146,12 +145,12 @@ sub update_ip { }; if ($@) { - die "ipam: error update subnet ip $ip: $@"; + die "ipam: error update subnet ip $ip: $@" if !$noerr; } } sub add_next_freeip { - my ($class, $plugin_config, $subnetid, $subnet, $hostname, $mac, $description) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $hostname, $mac, $description, $noerr) = @_; my $cidr = $subnet->{cidr}; my $mask = $subnet->{mask}; @@ -175,14 +174,14 @@ sub add_next_freeip { }; if ($@) { - die "can't find free ip in subnet $cidr: $@"; + die "can't find free ip in subnet $cidr: $@" if !$noerr; } - return "$ip/$mask"; + return "$ip/$mask" if $ip && $mask; } sub del_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $noerr) = @_; return if !$ip; @@ -197,7 +196,7 @@ sub del_ip { PVE::Network::SDN::api_request("DELETE", "$url/addresses/$ip_id", $headers); }; if ($@) { - die "error delete ip $ip: $@"; + die "error delete ip $ip: $@" if !$noerr; } } diff --git a/PVE/Network/SDN/Ipams/Plugin.pm b/PVE/Network/SDN/Ipams/Plugin.pm index a4c7dcb..c96eeda 100644 --- a/PVE/Network/SDN/Ipams/Plugin.pm +++ b/PVE/Network/SDN/Ipams/Plugin.pm @@ -67,25 +67,25 @@ sub parse_section_header { sub add_subnet { - my ($class, $plugin_config, $subnetid, $subnet) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $noerr) = @_; die "please implement inside plugin"; } sub del_subnet { - my ($class, $plugin_config, $subnetid, $subnet) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $noerr) = @_; die "please implement inside plugin"; } sub add_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $noerr) = @_; die "please implement inside plugin"; } sub update_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $noerr) = @_; # only update ip attributes (mac,hostname,..). Don't change the ip addresses itself, as some ipam # don't allow ip address change without del/add @@ -93,13 +93,13 @@ sub update_ip { } sub add_next_freeip { - my ($class, $plugin_config, $subnetid, $subnet, $hostname, $mac, $description) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $hostname, $mac, $description, $noerr) = @_; die "please implement inside plugin"; } sub del_ip { - my ($class, $plugin_config, $subnetid, $subnet, $ip) = @_; + my ($class, $plugin_config, $subnetid, $subnet, $ip, $noerr) = @_; die "please implement inside plugin"; } -- 2.39.2