From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 pve-network 01/12] sdn: dhcp: get next free ip for a specific IP version
Date: Fri, 5 Apr 2024 15:17:54 +0200 [thread overview]
Message-ID: <20240405131806.388178-2-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240405131806.388178-1-s.lendl@proxmox.com>
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>
---
src/PVE/Network/SDN/Subnets.pm | 2 +-
src/PVE/Network/SDN/Vnets.pm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm
index 3b08dcd..e2c8c9c 100644
--- a/src/PVE/Network/SDN/Subnets.pm
+++ b/src/PVE/Network/SDN/Subnets.pm
@@ -206,7 +206,7 @@ sub del_subnet {
}
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 $ip = undef;
diff --git a/src/PVE/Network/SDN/Vnets.pm b/src/PVE/Network/SDN/Vnets.pm
index 0dfdfd7..03609b7 100644
--- a/src/PVE/Network/SDN/Vnets.pm
+++ b/src/PVE/Network/SDN/Vnets.pm
@@ -95,7 +95,7 @@ sub get_subnet_from_vnet_ip {
}
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);
return if !$vnet;
@@ -109,7 +109,7 @@ sub add_next_free_cidr {
my $ips = {};
- my @ipversions = qw/ 4 6 /;
+ my @ipversions = defined($ipversion) ? ($ipversion) : qw/ 4 6 /;
for my $ipversion (@ipversions) {
my $ip = undef;
my $subnetcount = 0;
@@ -125,7 +125,7 @@ sub add_next_free_cidr {
};
die $@ if $@;
- if ($ip) {
+ if ($ip) {
$ips->{$ipversion} = $ip;
last;
}
--
2.44.0
next prev parent reply other threads:[~2024-04-05 13:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 13:17 [pve-devel] [PATCH v3 pve-network 00/12] SDN: Testing VNets as a blackbox and fixing found bugs Stefan Lendl
2024-04-05 13:17 ` Stefan Lendl [this message]
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 02/12] sdn: dhcp: request both IPv4 and IPv6 addresses on VM start Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 03/12] sdn: dhcp: only consider subnets that have dhcp-range configured Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 04/12] sdn: dhcp: rollback allocated ips on failure Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 05/12] sdn: zones: extract function that reads datacenter config Stefan Lendl
2024-04-05 13:17 ` [pve-devel] [PATCH v3 pve-network 06/12] dns: dnsmasq: extract function to systemctl command Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 07/12] sdn: dnsmasq: extract function that generates the ethers file path Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 08/12] sdn: dnsmasq: extract function that updates dnsmasq lease via dbus Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 09/12] sdn: api: extract function that creates the sdn directory Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 10/12] debian: blackbox tests depend on libpve-access-control at build Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 11/12] tests: test VNets functionality as a blackbox Stefan Lendl
2024-04-05 13:18 ` [pve-devel] [PATCH v3 pve-network 12/12] tests: remove old Vnets tests Stefan Lendl
2024-04-08 12:02 ` [pve-devel] [PATCH v3 pve-network 00/12] SDN: Testing VNets as a blackbox and fixing found bugs Stefan Hanreich
2024-04-08 15:59 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240405131806.388178-2-s.lendl@proxmox.com \
--to=s.lendl@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox