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
---
 python/vyos/template.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'python/vyos/template.py')

diff --git a/python/vyos/template.py b/python/vyos/template.py
index 1368f1f61..456239568 100644
--- a/python/vyos/template.py
+++ b/python/vyos/template.py
@@ -894,7 +894,9 @@ def kea6_shared_network_json(shared_networks):
             'name': name,
             'subnet6': []
         }
-        options = kea6_parse_options(config)
+
+        if 'common_options' in config:
+            network['option-data'] = kea6_parse_options(config['common_options'])
 
         if 'interface' in config:
             network['interface'] = config['interface']
@@ -903,9 +905,6 @@ def kea6_shared_network_json(shared_networks):
             for subnet, subnet_config in config['subnet'].items():
                 network['subnet6'].append(kea6_parse_subnet(subnet, subnet_config))
 
-        if options:
-            network['option-data'] = options
-
         out.append(network)
 
     return dumps(out, indent=4)
-- 
cgit v1.2.3