matthieu/pve-network
1
0
Fork 0
forked from Mirror/pve-network
Code Pull requests Activity

sdn: dhcp: get next free ip for a specific IP version

Browse source 
Specify the IP version (4|6) for which an IP shall be requested from the IPAM.

Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
Reviewed-by: Stefan Hanreich <s.hanreich@proxmox.com>
Tested-by: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
Stefan Lendl 2024-04-05 15:17:54 +02:00 committed by Thomas Lamprecht
parent 00370995cb
commit e06301af3a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/PVE/Network/SDN/Subnets.pm
View file

@ -206,7 +206,7 @@ sub del_subnet {
} }
sub add_next_free_ip { sub add_next_free_ip {
my ($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns, $dhcprange) = @_; my ($zone, $subnetid, $subnet, $hostname, $mac, $vmid, $skipdns, $dhcprange, $ipversion) = @_;
my $cidr = undef; my $cidr = undef;
my $ip = undef; my $ip = undef;

4
src/PVE/Network/SDN/Vnets.pm
View file

@ -95,7 +95,7 @@ sub get_subnet_from_vnet_ip {
} }
sub add_next_free_cidr { sub add_next_free_cidr {
my ($vnetid, $hostname, $mac, $vmid, $skipdns, $dhcprange) = @_; my ($vnetid, $hostname, $mac, $vmid, $skipdns, $dhcprange, $ipversion) = @_;
my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid);
return if !$vnet; return if !$vnet;
@ -109,7 +109,7 @@ sub add_next_free_cidr {
my $ips = {}; my $ips = {};
my @ipversions = qw/ 4 6 /; my @ipversions = defined($ipversion) ? ($ipversion) : qw/ 4 6 /;
for my $ipversion (@ipversions) { for my $ipversion (@ipversions) {
my $ip = undef; my $ip = undef;
my $subnetcount = 0; my $subnetcount = 0;