subnet: add dhcp options

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

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>

diff --git a/src/PVE/Network/SDN/SubnetPlugin.pm b/src/PVE/Network/SDN/SubnetPlugin.pm
index 15b370fb91ce80e9cab368aad42c75dbf314eea7..a4adae8ee8524dab412d9cc15fd3d9c35b78d03c 100644 (file)
--- 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' -> <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 },
     };
 }
 

diff --git a/src/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm
index f654d3a7c922975c1853f5a53aa2f2e1cf713da0..6e74de11e9007cc2cbc6d5ff1909598cd9f23f5c 100644 (file)
--- 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) = @_;