From 45d472c8782f927980044eaba0d49421e91fc0c8 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Sat, 13 Jan 2024 00:28:01 +0100
Subject: dhcpv6: T3316: Move options to separate node and extend scopes

* Also migrate `address-range` to `range` tag node for consistency with dhcpv4 server syntax
---
 src/op_mode/dhcp.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/op_mode')

diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py
index 02f4d5bbb..a64acec31 100755
--- a/src/op_mode/dhcp.py
+++ b/src/op_mode/dhcp.py
@@ -194,14 +194,11 @@ def _get_pool_size(pool, family='inet'):
     size = 0
     subnets = config.list_nodes(f'{base} subnet')
     for subnet in subnets:
-        if family == 'inet6':
-            ranges = config.list_nodes(f'{base} subnet {subnet} address-range start')
-        else:
-            ranges = config.list_nodes(f'{base} subnet {subnet} range')
+        ranges = config.list_nodes(f'{base} subnet {subnet} range')
         for range in ranges:
             if family == 'inet6':
-                start = config.list_nodes(f'{base} subnet {subnet} address-range start')[0]
-                stop = config.value(f'{base} subnet {subnet} address-range start {start} stop')
+                start = config.value(f'{base} subnet {subnet} range {range} start')
+                stop = config.value(f'{base} subnet {subnet} range {range} stop')
             else:
                 start = config.value(f'{base} subnet {subnet} range {range} start')
                 stop = config.value(f'{base} subnet {subnet} range {range} stop')
-- 
cgit v1.2.3