mirror of
git://git.proxmox.com/git/pve-network.git
synced 2025-04-30 11:27:11 +02:00
subnet: vnet: refactor IPAM related methods
Those methods are used by the DHCP plugins to attain the next free IP address for a given DHCP range, as well as delete all entries with a certain MAC address. Co-Authored-By: Alexandre Derumier <aderumier@odiso.com> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
Stefan Hanreich
Thomas Lamprecht
parent
8a8bba7083
commit
7ba1781725
|
|
@ -172,8 +172,7 @@ sub on_update_hook {
|
|||
}
|
||||
if(!$old_gateway || $gateway && $gateway ne $old_gateway) {
|
||||
my $hostname = "$vnetid-gw";
|
||||
my $description = "gateway";
|
||||
PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $gateway, $hostname, $mac, $description, 1);
|
||||
PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $gateway, $hostname, $mac, undef, 1);
|
||||
}
|
||||
|
||||
#delete old gateway after update
|
||||
|
|
|
|||
|
|
@ -98,14 +98,12 @@ sub get_subnet {
|
|||
}
|
||||
|
||||
sub find_ip_subnet {
|
||||
my ($ip, $mask, $subnets) = @_;
|
||||
my ($ip, $subnets) = @_;
|
||||
|
||||
my $subnet = undef;
|
||||
my $subnetid = undef;
|
||||
|
||||
foreach my $id (sort keys %{$subnets}) {
|
||||
|
||||
next if $mask ne $subnets->{$id}->{mask};
|
||||
my $cidr = $subnets->{$id}->{cidr};
|
||||
my $subnet_matcher = subnet_matcher($cidr);
|
||||
next if !$subnet_matcher->($ip);
|
||||
|
|
@ -207,12 +205,11 @@ sub del_subnet {
|
|||
$plugin->del_subnet($plugin_config, $subnetid, $subnet);
|
||||
}
|
||||
|
||||
sub next_free_ip {
|
||||
my ($zone, $subnetid, $subnet, $hostname, $mac, $description, $skipdns) = @_;
|
||||
sub add_next_free_ip {
|
||||
my ($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns, $dhcprange) = @_;
|
||||
|
||||
my $cidr = undef;
|
||||
my $ip = undef;
|
||||
$description = '' if !$description;
|
||||
|
||||
my $ipamid = $zone->{ipam};
|
||||
my $dns = $zone->{dns};
|
||||
|
|
@ -230,10 +227,28 @@ sub next_free_ip {
|
|||
my $plugin_config = $ipam_cfg->{ids}->{$ipamid};
|
||||
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
|
||||
eval {
|
||||
$cidr = $plugin->add_next_freeip($plugin_config, $subnetid, $subnet, $hostname, $mac, $description);
|
||||
($ip, undef) = split(/\//, $cidr);
|
||||
if ($dhcprange) {
|
||||
my $data = {
|
||||
mac => $mac,
|
||||
hostname => $hostname,
|
||||
vmid => $vmid,
|
||||
};
|
||||
|
||||
my $dhcp_ranges = PVE::Network::SDN::Subnets::get_dhcp_ranges($subnet);
|
||||
|
||||
foreach my $range (@$dhcp_ranges) {
|
||||
$ip = $plugin->add_range_next_freeip($plugin_config, $subnet, $range, $data);
|
||||
next if !$ip;
|
||||
}
|
||||
} else {
|
||||
$ip = $plugin->add_next_freeip($plugin_config, $subnetid, $subnet, $hostname, $mac, $vmid);
|
||||
}
|
||||
};
|
||||
|
||||
die $@ if $@;
|
||||
|
||||
eval { PVE::Network::SDN::Ipams::add_cache_mac_ip($mac, $ip); };
|
||||
warn $@ if $@;
|
||||
}
|
||||
|
||||
eval {
|
||||
|
|
@ -250,15 +265,15 @@ sub next_free_ip {
|
|||
#rollback
|
||||
my $err = $@;
|
||||
eval {
|
||||
PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname)
|
||||
PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac)
|
||||
};
|
||||
die $err;
|
||||
}
|
||||
return $cidr;
|
||||
return $ip;
|
||||
}
|
||||
|
||||
sub add_ip {
|
||||
my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway, $skipdns) = @_;
|
||||
my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $vmid, $is_gateway, $skipdns) = @_;
|
||||
|
||||
return if !$subnet || !$ip;
|
||||
|
||||
|
|
@ -287,7 +302,7 @@ sub add_ip {
|
|||
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
|
||||
|
||||
eval {
|
||||
$plugin->add_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description, $is_gateway);
|
||||
$plugin->add_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $vmid, $is_gateway);
|
||||
};
|
||||
die $@ if $@;
|
||||
}
|
||||
|
|
@ -304,14 +319,14 @@ sub add_ip {
|
|||
#rollback
|
||||
my $err = $@;
|
||||
eval {
|
||||
PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname)
|
||||
PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac)
|
||||
};
|
||||
die $err;
|
||||
}
|
||||
}
|
||||
|
||||
sub update_ip {
|
||||
my ($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $description, $skipdns) = @_;
|
||||
my ($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $vmid, $skipdns) = @_;
|
||||
|
||||
return if !$subnet || !$ip;
|
||||
|
||||
|
|
@ -338,7 +353,7 @@ sub update_ip {
|
|||
my $plugin_config = $ipam_cfg->{ids}->{$ipamid};
|
||||
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
|
||||
eval {
|
||||
$plugin->update_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $description);
|
||||
$plugin->update_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $vmid);
|
||||
};
|
||||
die $@ if $@;
|
||||
}
|
||||
|
|
@ -358,7 +373,7 @@ sub update_ip {
|
|||
}
|
||||
|
||||
sub del_ip {
|
||||
my ($zone, $subnetid, $subnet, $ip, $hostname, $skipdns) = @_;
|
||||
my ($zone, $subnetid, $subnet, $ip, $hostname, $mac, $skipdns) = @_;
|
||||
|
||||
return if !$subnet || !$ip;
|
||||
|
||||
|
|
@ -383,6 +398,9 @@ sub del_ip {
|
|||
my $plugin_config = $ipam_cfg->{ids}->{$ipamid};
|
||||
my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type});
|
||||
$plugin->del_ip($plugin_config, $subnetid, $subnet, $ip);
|
||||
|
||||
eval { PVE::Network::SDN::Ipams::del_cache_mac_ip($mac, $ip); };
|
||||
warn $@ if $@;
|
||||
}
|
||||
|
||||
eval {
|
||||
|
|
|
|||
|
|
@ -80,81 +80,108 @@ sub get_subnets {
|
|||
return $subnets;
|
||||
}
|
||||
|
||||
sub get_subnet_from_vnet_cidr {
|
||||
my ($vnetid, $cidr) = @_;
|
||||
sub get_subnet_from_vnet_ip {
|
||||
my ($vnetid, $ip) = @_;
|
||||
|
||||
my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1);
|
||||
my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid);
|
||||
my $zoneid = $vnet->{zone};
|
||||
my $zone = PVE::Network::SDN::Zones::get_zone($zoneid);
|
||||
|
||||
my ($ip, $mask) = split(/\//, $cidr);
|
||||
die "ip address is not in cidr format" if !$mask;
|
||||
|
||||
my ($subnetid, $subnet) = PVE::Network::SDN::Subnets::find_ip_subnet($ip, $mask, $subnets);
|
||||
my ($subnetid, $subnet) = PVE::Network::SDN::Subnets::find_ip_subnet($ip, $subnets);
|
||||
|
||||
return ($zone, $subnetid, $subnet, $ip);
|
||||
}
|
||||
|
||||
sub get_next_free_cidr {
|
||||
my ($vnetid, $hostname, $mac, $description, $ipversion, $skipdns) = @_;
|
||||
sub add_next_free_cidr {
|
||||
my ($vnetid, $hostname, $mac, $vmid, $skipdns, $dhcprange) = @_;
|
||||
|
||||
my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid);
|
||||
return if !$vnet;
|
||||
|
||||
my $zoneid = $vnet->{zone};
|
||||
my $zone = PVE::Network::SDN::Zones::get_zone($zoneid);
|
||||
|
||||
return if !$zone->{ipam};
|
||||
return if !$zone->{ipam} || !$zone->{dhcp};
|
||||
|
||||
$ipversion = 4 if !$ipversion;
|
||||
my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1);
|
||||
my $ip = undef;
|
||||
my $subnetcount = 0;
|
||||
|
||||
foreach my $subnetid (sort keys %{$subnets}) {
|
||||
my $subnet = $subnets->{$subnetid};
|
||||
my $network = $subnet->{network};
|
||||
my $ips = {};
|
||||
|
||||
next if $ipversion != Net::IP::ip_get_version($network);
|
||||
$subnetcount++;
|
||||
my @ipversions = qw/ 4 6 /;
|
||||
for my $ipversion (@ipversions) {
|
||||
my $ip = undef;
|
||||
my $subnetcount = 0;
|
||||
foreach my $subnetid (sort keys %{$subnets}) {
|
||||
my $subnet = $subnets->{$subnetid};
|
||||
my $network = $subnet->{network};
|
||||
|
||||
eval {
|
||||
$ip = PVE::Network::SDN::Subnets::next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $description, $skipdns);
|
||||
};
|
||||
warn $@ if $@;
|
||||
last if $ip;
|
||||
next if Net::IP::ip_get_version($network) != $ipversion || $ips->{$ipversion};
|
||||
$subnetcount++;
|
||||
|
||||
eval {
|
||||
$ip = PVE::Network::SDN::Subnets::add_next_free_ip($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns, $dhcprange);
|
||||
};
|
||||
die $@ if $@;
|
||||
|
||||
if ($ip) {
|
||||
$ips->{$ipversion} = $ip;
|
||||
last;
|
||||
}
|
||||
}
|
||||
die "can't find any free ip" if !$ip && $subnetcount > 0;
|
||||
}
|
||||
die "can't find any free ip" if !$ip && $subnetcount > 0;
|
||||
|
||||
return $ip;
|
||||
}
|
||||
|
||||
sub add_cidr {
|
||||
my ($vnetid, $cidr, $hostname, $mac, $description, $skipdns) = @_;
|
||||
sub add_ip {
|
||||
my ($vnetid, $ip, $hostname, $mac, $vmid, $skipdns) = @_;
|
||||
|
||||
return if !$vnetid;
|
||||
|
||||
my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr);
|
||||
PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac, $description, undef, $skipdns);
|
||||
my ($zone, $subnetid, $subnet) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_ip($vnetid, $ip);
|
||||
PVE::Network::SDN::Subnets::add_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac, $vmid, undef, $skipdns);
|
||||
}
|
||||
|
||||
sub update_cidr {
|
||||
my ($vnetid, $cidr, $hostname, $oldhostname, $mac, $description, $skipdns) = @_;
|
||||
sub update_ip {
|
||||
my ($vnetid, $ip, $hostname, $oldhostname, $mac, $vmid, $skipdns) = @_;
|
||||
|
||||
return if !$vnetid;
|
||||
|
||||
my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr);
|
||||
PVE::Network::SDN::Subnets::update_ip($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $description, $skipdns);
|
||||
my ($zone, $subnetid, $subnet) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_ip($vnetid, $ip);
|
||||
PVE::Network::SDN::Subnets::update_ip($zone, $subnetid, $subnet, $ip, $hostname, $oldhostname, $mac, $vmid, $skipdns);
|
||||
}
|
||||
|
||||
sub del_cidr {
|
||||
my ($vnetid, $cidr, $hostname, $skipdns) = @_;
|
||||
sub del_ip {
|
||||
my ($vnetid, $ip, $hostname, $mac, $skipdns) = @_;
|
||||
|
||||
return if !$vnetid;
|
||||
|
||||
my ($zone, $subnetid, $subnet, $ip) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_cidr($vnetid, $cidr);
|
||||
PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname, $skipdns);
|
||||
my ($zone, $subnetid, $subnet) = PVE::Network::SDN::Vnets::get_subnet_from_vnet_ip($vnetid, $ip);
|
||||
PVE::Network::SDN::Subnets::del_ip($zone, $subnetid, $subnet, $ip, $hostname, $mac, $skipdns);
|
||||
}
|
||||
|
||||
sub get_ips_from_mac {
|
||||
my ($vnetid, $mac) = @_;
|
||||
|
||||
my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid);
|
||||
return if !$vnet;
|
||||
|
||||
my $zoneid = $vnet->{zone};
|
||||
my $zone = PVE::Network::SDN::Zones::get_zone($zoneid);
|
||||
|
||||
return if !$zone->{ipam} || !$zone->{dhcp};
|
||||
|
||||
return PVE::Network::SDN::Ipams::get_ips_from_mac($mac, $zoneid, $zone);
|
||||
}
|
||||
|
||||
sub del_ips_from_mac {
|
||||
my ($vnetid, $mac, $hostname) = @_;
|
||||
|
||||
my ($ip4, $ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac);
|
||||
PVE::Network::SDN::Vnets::del_ip($vnetid, $ip4, $hostname, $mac) if $ip4;
|
||||
PVE::Network::SDN::Vnets::del_ip($vnetid, $ip6, $hostname, $mac) if $ip6;
|
||||
|
||||
return ($ip4, $ip6);
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
Loading…
Reference in a new issue