[pve-devel] [PATCH pve-network 13/15] subnets: add add_subnet/del_subnet
Alexandre Derumier
aderumier at odiso.com
Tue Jan 5 10:35:34 CET 2021
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
PVE/API2/Network/SDN/Subnets.pm | 19 ++++++++-----------
PVE/Network/SDN/SubnetPlugin.pm | 5 +----
PVE/Network/SDN/Subnets.pm | 20 ++++++++++++++++++++
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/PVE/API2/Network/SDN/Subnets.pm b/PVE/API2/Network/SDN/Subnets.pm
index 07ef2e1..f7e095f 100644
--- a/PVE/API2/Network/SDN/Subnets.pm
+++ b/PVE/API2/Network/SDN/Subnets.pm
@@ -277,21 +277,18 @@ __PACKAGE__->register_method ({
sub {
my $cfg = PVE::Network::SDN::Subnets::config();
- my $scfg = PVE::Network::SDN::Subnets::sdn_subnets_config($cfg, $id);
+ my $scfg = PVE::Network::SDN::Subnets::sdn_subnets_config($cfg, $id, 1);
- my $subnets_cfg = PVE::Network::SDN::Subnets::config();
my $vnets_cfg = PVE::Network::SDN::Vnets::config();
- PVE::Network::SDN::SubnetPlugin->on_delete_hook($id, $subnets_cfg, $vnets_cfg);
+ PVE::Network::SDN::SubnetPlugin->on_delete_hook($id, $cfg, $vnets_cfg);
- my $ipam_cfg = PVE::Network::SDN::Ipams::config();
- my $ipam = $cfg->{ids}->{$id}->{ipam};
- if ($ipam) {
- raise_param_exc({ ipam => "$ipam not existing"}) if !$ipam_cfg->{ids}->{$ipam};
- my $plugin_config = $ipam_cfg->{ids}->{$ipam};
- my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
- $plugin->del_subnet($plugin_config, $id, $scfg);
- }
+ my $zone_cfg = PVE::Network::SDN::Zones::config();
+ my $vnet = $param->{vnet};
+ my $zoneid = $vnets_cfg->{ids}->{$vnet}->{zone};
+ my $zone = $zone_cfg->{ids}->{$zoneid};
+
+ PVE::Network::SDN::Subnets::del_subnet($zone, $id, $scfg);
delete $cfg->{ids}->{$id};
diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/PVE/Network/SDN/SubnetPlugin.pm
index 68efeb6..b4c8954 100644
--- a/PVE/Network/SDN/SubnetPlugin.pm
+++ b/PVE/Network/SDN/SubnetPlugin.pm
@@ -129,10 +129,7 @@ sub on_update_hook {
if ($ipam) {
- my $ipam_cfg = PVE::Network::SDN::Ipams::config();
- my $plugin_config = $ipam_cfg->{ids}->{$ipam};
- my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
- $plugin->add_subnet($plugin_config, $subnetid, $subnet);
+ PVE::Network::SDN::Subnets::add_subnet($zone, $subnetid, $subnet);
#don't register gateway for pointopoint
return if $pointopoint;
diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm
index ec0fb66..34b3450 100644
--- a/PVE/Network/SDN/Subnets.pm
+++ b/PVE/Network/SDN/Subnets.pm
@@ -161,6 +161,26 @@ sub del_dns_ptr_record {
$plugin->del_ptr_record($plugin_config, $reversezone, $ip);
}
+sub add_subnet {
+ my ($zone, $subnetid, $subnet) = @_;
+
+ my $ipam = $zone->{ipam};
+ my $ipam_cfg = PVE::Network::SDN::Ipams::config();
+ my $plugin_config = $ipam_cfg->{ids}->{$ipam};
+ my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
+ $plugin->add_subnet($plugin_config, $subnetid, $subnet);
+}
+
+sub del_subnet {
+ my ($zone, $subnetid, $subnet) = @_;
+
+ my $ipam = $zone->{ipam};
+ my $ipam_cfg = PVE::Network::SDN::Ipams::config();
+ my $plugin_config = $ipam_cfg->{ids}->{$ipam};
+ my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
+ $plugin->del_subnet($plugin_config, $subnetid, $subnet);
+}
+
sub next_free_ip {
my ($zone, $subnetid, $subnet, $hostname, $mac, $description) = @_;
--
2.20.1
More information about the pve-devel
mailing list