From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EDECFBF3B8 for ; Thu, 4 Jan 2024 17:28:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CFF0D1269B for ; Thu, 4 Jan 2024 17:27:36 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 4 Jan 2024 17:27:34 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 6654C7E11; Thu, 4 Jan 2024 17:27:34 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 622F420E884; Thu, 4 Jan 2024 17:27:34 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 4 Jan 2024 17:27:30 +0100 Message-Id: <20240104162733.4152467-4-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240104162733.4152467-1-aderumier@odiso.com> References: <20240104162733.4152467-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [pve-network 1/4] vnets: use ipam without dhcp X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jan 2024 16:28:07 -0000 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 --- 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