Mirror/pve-network
1
0
Fork 1
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-04-30 11:27:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

subnet: add dhcp options

Browse source 
Additionally add a helper function for parsing the DHCP ranges of a
subnet.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
Stefan Hanreich 2023-11-17 12:39:41 +01:00 committed by Thomas Lamprecht
parent a1845dad80
commit 290fa5c9af
2 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/PVE/Network/SDN/SubnetPlugin.pm
View file

@ -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' -> <hostname>.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 },
};
}

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

@ -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) = @_;