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 442DA9A336 for ; Fri, 17 Nov 2023 12:40:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2316730AA8 for ; Fri, 17 Nov 2023 12:40:19 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 17 Nov 2023 12:40:18 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 1726F2C210A; Fri, 17 Nov 2023 12:40:18 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 17 Nov 2023 12:39:41 +0100 Message-Id: <20231117114011.834002-4-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231117114011.834002-1-s.hanreich@proxmox.com> References: <20231117114011.834002-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.516 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 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [subnets.pm, subnetplugin.pm] Subject: [pve-devel] [PATCH v4 pve-network 03/33] subnet: add dhcp options 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: Fri, 17 Nov 2023 11:40:49 -0000 Additionally add a helper function for parsing the DHCP ranges of a subnet. Signed-off-by: Stefan Hanreich --- src/PVE/Network/SDN/SubnetPlugin.pm | 29 +++++++++++++++++++++++++++++ src/PVE/Network/SDN/Subnets.pm | 23 +++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/src/PVE/Network/SDN/SubnetPlugin.pm b/src/PVE/Network/SDN/SubnetPlugin.pm index 15b370f..a4adae8 100644 --- a/src/PVE/Network/SDN/SubnetPlugin.pm +++ b/src/PVE/Network/SDN/SubnetPlugin.pm @@ -61,6 +61,19 @@ sub private { return $defaultData; } +my $dhcp_range_fmt = { + 'start-address' => { + type => 'ip', + description => 'Start address for the DHCP IP range', + }, + 'end-address' => { + type => 'ip', + description => 'End address for the DHCP IP range', + }, +}; + +PVE::JSONSchema::register_format('pve-sdn-dhcp-range', $dhcp_range_fmt); + sub properties { return { vnet => { @@ -84,6 +97,20 @@ sub properties { type => 'string', format => 'dns-name', description => "dns domain zone prefix ex: 'adm' -> .adm.mydomain.com", }, + 'dhcp-range' => { + type => 'array', + description => 'A list of DHCP ranges for this subnet', + optional => 1, + items => { + type => 'string', + format => 'pve-sdn-dhcp-range', + } + }, + 'dhcp-dns-server' => { + type => 'ip', + description => 'IP address for the DNS server', + optional => 1, + }, }; } @@ -94,6 +121,8 @@ sub options { # routes => { optional => 1 }, snat => { optional => 1 }, dnszoneprefix => { optional => 1 }, + 'dhcp-range' => { optional => 1 }, + 'dhcp-dns-server' => { optional => 1 }, }; } diff --git a/src/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm index f654d3a..6e74de1 100644 --- a/src/PVE/Network/SDN/Subnets.pm +++ b/src/PVE/Network/SDN/Subnets.pm @@ -8,6 +8,7 @@ use Net::IP; use NetAddr::IP qw(:lower); use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); +use PVE::JSONSchema qw(parse_property_string); use PVE::Network::SDN::Dns; use PVE::Network::SDN::Ipams; @@ -36,6 +37,28 @@ sub sdn_subnets_config { return $scfg; } +sub get_dhcp_ranges { + my ($subnet_config) = @_; + + my @dhcp_ranges = (); + + if ($subnet_config->{'dhcp-range'}) { + foreach my $element (@{$subnet_config->{'dhcp-range'}}) { + my $dhcp_range = eval { parse_property_string('pve-sdn-dhcp-range', $element) }; + + if ($@ || !$dhcp_range) { + warn "Unable to parse dhcp-range string: $element\n"; + warn "$@\n" if $@; + next; + } + + push @dhcp_ranges, $dhcp_range; + } + } + + return \@dhcp_ranges; +} + sub config { my ($running) = @_; -- 2.39.2