From 4c9446dc13922cd328b45ef545e83d4e10c01a36 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 22 Apr 2022 21:51:41 +0200
Subject: dhcpv6: T4357: no need to make the vendor options conditional - they
do not hurt
Always render int he vendor specific option definition - it doesn't hurt.
---
data/templates/dhcp-server/dhcpdv6.conf.j2 | 2 --
src/conf_mode/dhcpv6_server.py | 8 --------
2 files changed, 10 deletions(-)
diff --git a/data/templates/dhcp-server/dhcpdv6.conf.j2 b/data/templates/dhcp-server/dhcpdv6.conf.j2
index 43327859e..d4b7f74d9 100644
--- a/data/templates/dhcp-server/dhcpdv6.conf.j2
+++ b/data/templates/dhcp-server/dhcpdv6.conf.j2
@@ -11,11 +11,9 @@ option dhcp6.preference {{ preference }};
{% if global_parameters.name_server is vyos_defined %}
option dhcp6.name-servers {{ global_parameters.name_server | join(', ') }};
{% endif %}
-{% if vsio_cisco_tftp %}
option space cisco;
option cisco.tftp-servers code 1 = array of ip6-address;
option vsio.cisco code 9 = encapsulate cisco;
-{% endif %}
# Shared network configration(s)
{% if shared_network_name is vyos_defined %}
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index d0736eadb..9922f2c5c 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -42,14 +42,6 @@ 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):
--
cgit v1.2.3