Merge branch 'T4357' of https://github.com/sever-sever/vyos-1x into current

* 'T4357' of https://github.com/sever-sever/vyos-1x:
  dhcpv6: T4357: Add dhcpv6 options for cisco VoIP tftp

1 files changed, 8 insertions, 0 deletions

diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index 9922f2c5c..d0736eadb 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -42,6 +42,14 @@ def get_config(config=None):
         return None
 
     dhcpv6 = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True)
+
+    for network, network_config in dhcpv6['shared_network_name'].items():
+        # A shared-network requires a subnet definition
+        if 'subnet' in network_config:
+            for subnet, subnet_config in network_config['subnet'].items():
+                if dict_search('vsio.cisco.tftp_server', subnet_config):
+                    dhcpv6['vsio_cisco_tftp'] = True
+
     return dhcpv6
 
 def verify(dhcpv6):