From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [pve-network 1/4] vnets: use ipam without dhcp
Date: Thu, 4 Jan 2024 17:27:30 +0100 [thread overview]
Message-ID: <20240104162733.4152467-4-aderumier@odiso.com> (raw)
In-Reply-To: <20240104162733.4152467-1-aderumier@odiso.com>
User should be able to use ipam without need to use dhcp.
(with static configuration for example).
Could be use to firewall rules or other rules based on ipam
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
src/PVE/Network/SDN/Vnets.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/PVE/Network/SDN/Vnets.pm b/src/PVE/Network/SDN/Vnets.pm
index 0dfdfd7..060cb3c 100644
--- a/src/PVE/Network/SDN/Vnets.pm
+++ b/src/PVE/Network/SDN/Vnets.pm
@@ -103,7 +103,7 @@ sub add_next_free_cidr {
my $zoneid = $vnet->{zone};
my $zone = PVE::Network::SDN::Zones::get_zone($zoneid);
- return if !$zone->{ipam} || !$zone->{dhcp};
+ return if !$zone->{ipam};
my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1);
@@ -170,7 +170,7 @@ sub get_ips_from_mac {
my $zoneid = $vnet->{zone};
my $zone = PVE::Network::SDN::Zones::get_zone($zoneid);
- return if !$zone->{ipam} || !$zone->{dhcp};
+ return if !$zone->{ipam};
return PVE::Network::SDN::Ipams::get_ips_from_mac($mac, $zoneid, $zone);
}
@@ -193,7 +193,7 @@ sub add_dhcp_mapping {
my $zoneid = $vnet->{zone};
my $zone = PVE::Network::SDN::Zones::get_zone($zoneid);
- return if !$zone->{ipam} || !$zone->{dhcp};
+ return if !$zone->{ipam};
my ($ip4, $ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac);
if ( ! ($ip4 || $ip6) ) {
@@ -202,7 +202,7 @@ sub add_dhcp_mapping {
($ip4, $ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnetid, $mac);
print "got new IP from IPAM: $ip4 $ip6\n";
}
- PVE::Network::SDN::Dhcp::add_mapping($vnetid, $mac, $ip4, $ip6) if $ip4 || $ip6;
+ PVE::Network::SDN::Dhcp::add_mapping($vnetid, $mac, $ip4, $ip6) if $zone->{dhcp} && ($ip4 || $ip6);
}
1;
--
2.39.2
next prev parent reply other threads:[~2024-01-04 16:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-04 16:27 [pve-devel] [pve-network/qemu-server/pve-container/pve-manager] RFC: " Alexandre Derumier
2024-01-04 16:27 ` [pve-devel] [qemu-server 1/1] add_next_free_cidr: remove old dhcprange param Alexandre Derumier
2024-01-04 16:27 ` [pve-devel] [pve-manager 1/1] sdn: zones: add ipam reservation option Alexandre Derumier
2024-01-04 16:27 ` Alexandre Derumier [this message]
2024-01-04 16:27 ` [pve-devel] [pve-network 2/4] vnets: add_next_free_cidr : skip if ipamreservation is not defined Alexandre Derumier
2024-01-04 16:27 ` [pve-devel] [pve-network 3/4] subnets: call add_range_next_freeip only if dhcp is defined Alexandre Derumier
2024-01-04 16:27 ` [pve-devel] [pve-network 4/4] api2: ipam status: display ipam zones without dhcp flag Alexandre Derumier
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=20240104162733.4152467-4-aderumier@odiso.com \
--to=aderumier@odiso.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.