From 50a9bf97e193e7f1dcfffa2deea2b6edde112c01 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 1 Dec 2020 15:33:29 +0100
Subject: dhcpv6: T1433: combine templates for v4 and v6

---
 data/templates/dhcp-server/dhcpdv6.conf.tmpl   | 90 ++++++++++++++++++++++++++
 data/templates/dhcpv6-server/dhcpdv6.conf.tmpl | 90 --------------------------
 src/conf_mode/dhcpv6_server.py                 |  2 +-
 3 files changed, 91 insertions(+), 91 deletions(-)
 create mode 100644 data/templates/dhcp-server/dhcpdv6.conf.tmpl
 delete mode 100644 data/templates/dhcpv6-server/dhcpdv6.conf.tmpl

diff --git a/data/templates/dhcp-server/dhcpdv6.conf.tmpl b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
new file mode 100644
index 000000000..aa6d7fb5d
--- /dev/null
+++ b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
@@ -0,0 +1,90 @@
+### Autogenerated by dhcpv6_server.py ###
+
+# For options please consult the following website:
+# https://www.isc.org/wp-content/uploads/2017/08/dhcp43options.html
+
+log-facility local7;
+{% if preference %}
+option dhcp6.preference {{ preference }};
+{% endif %}
+
+# Shared network configration(s)
+{% for network in shared_network %}
+{% if not network.disabled %}
+shared-network {{ network.name }} {
+    {% if network.common.info_refresh_time %}
+    option dhcp6.info-refresh-time {{ network.common.info_refresh_time }};
+    {% endif %}
+    {% if network.common.domain_search %}
+    option dhcp6.domain-search "{{ network.common.domain_search | join('", "') }}";
+    {% endif %}
+    {% if network.common.dns_server %}
+    option dhcp6.name-servers {{ network.common.dns_server | join(', ') }};
+    {% endif %}
+    {% for subnet in network.subnet %}
+    subnet6 {{ subnet.network }} {
+        {% for range in subnet.range6_prefix %}
+        range6 {{ range.prefix }}{{ " temporary" if range.temporary }};
+        {% endfor %}
+        {% for range in subnet.range6 %}
+        range6 {{ range.start }} {{ range.stop }};
+        {% endfor %}
+        {% if subnet.domain_search %}
+        option dhcp6.domain-search "{{ subnet.domain_search | join('", "') }}";
+        {% endif %}
+        {% if subnet.lease_def %}
+        default-lease-time {{ subnet.lease_def }};
+        {% endif %}
+        {% if subnet.lease_max %}
+        max-lease-time {{ subnet.lease_max }};
+        {% endif %}
+        {% if subnet.lease_min %}
+        min-lease-time {{ subnet.lease_min }};
+        {% endif %}
+        {% if subnet.dns_server %}
+        option dhcp6.name-servers {{ subnet.dns_server | join(', ') }};
+        {% endif %}
+        {% if subnet.nis_domain %}
+        option dhcp6.nis-domain-name "{{ subnet.nis_domain }}";
+        {% endif %}
+        {% if subnet.nis_server %}
+        option dhcp6.nis-servers {{ subnet.nis_server | join(', ') }};
+        {% endif %}
+        {% if subnet.nisp_domain %}
+        option dhcp6.nisp-domain-name "{{ subnet.nisp_domain }}";
+        {% endif %}
+        {% if subnet.nisp_server %}
+        option dhcp6.nisp-servers {{ subnet.nisp_server | join(', ') }};
+        {% endif %}
+        {% if subnet.sip_address %}
+        option dhcp6.sip-servers-addresses {{ subnet.sip_address | join(', ') }};
+        {% endif %}
+        {% if subnet.sip_hostname %}
+        option dhcp6.sip-servers-names "{{ subnet.sip_hostname | join('", "') }}";
+        {% endif %}
+        {% if subnet.sntp_server %}
+        option dhcp6.sntp-servers {{ subnet.sntp_server | join(', ') }};
+        {% endif %}
+        {% for prefix in subnet.prefix_delegation %}
+        prefix6 {{ prefix.start }} {{ prefix.stop }} /{{ prefix.length }};
+        {% endfor %}
+        {% for host in subnet.static_mapping %}
+        {% if not host.disabled %}
+        host {{ network.name }}_{{ host.name }} {
+            {% if host.client_identifier %}
+            host-identifier option dhcp6.client-id {{ host.client_identifier }};
+            {% endif %}
+            {% if host.ipv6_address %}
+            fixed-address6 {{ host.ipv6_address }};
+            {% endif %}
+        }
+        {% endif %}
+        {% endfor %}
+    }
+    {% endfor %}
+    on commit {
+        set shared-networkname = "{{ network.name }}";
+    }
+}
+{% endif %}
+{% endfor %}
diff --git a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl b/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
deleted file mode 100644
index aa6d7fb5d..000000000
--- a/data/templates/dhcpv6-server/dhcpdv6.conf.tmpl
+++ /dev/null
@@ -1,90 +0,0 @@
-### Autogenerated by dhcpv6_server.py ###
-
-# For options please consult the following website:
-# https://www.isc.org/wp-content/uploads/2017/08/dhcp43options.html
-
-log-facility local7;
-{% if preference %}
-option dhcp6.preference {{ preference }};
-{% endif %}
-
-# Shared network configration(s)
-{% for network in shared_network %}
-{% if not network.disabled %}
-shared-network {{ network.name }} {
-    {% if network.common.info_refresh_time %}
-    option dhcp6.info-refresh-time {{ network.common.info_refresh_time }};
-    {% endif %}
-    {% if network.common.domain_search %}
-    option dhcp6.domain-search "{{ network.common.domain_search | join('", "') }}";
-    {% endif %}
-    {% if network.common.dns_server %}
-    option dhcp6.name-servers {{ network.common.dns_server | join(', ') }};
-    {% endif %}
-    {% for subnet in network.subnet %}
-    subnet6 {{ subnet.network }} {
-        {% for range in subnet.range6_prefix %}
-        range6 {{ range.prefix }}{{ " temporary" if range.temporary }};
-        {% endfor %}
-        {% for range in subnet.range6 %}
-        range6 {{ range.start }} {{ range.stop }};
-        {% endfor %}
-        {% if subnet.domain_search %}
-        option dhcp6.domain-search "{{ subnet.domain_search | join('", "') }}";
-        {% endif %}
-        {% if subnet.lease_def %}
-        default-lease-time {{ subnet.lease_def }};
-        {% endif %}
-        {% if subnet.lease_max %}
-        max-lease-time {{ subnet.lease_max }};
-        {% endif %}
-        {% if subnet.lease_min %}
-        min-lease-time {{ subnet.lease_min }};
-        {% endif %}
-        {% if subnet.dns_server %}
-        option dhcp6.name-servers {{ subnet.dns_server | join(', ') }};
-        {% endif %}
-        {% if subnet.nis_domain %}
-        option dhcp6.nis-domain-name "{{ subnet.nis_domain }}";
-        {% endif %}
-        {% if subnet.nis_server %}
-        option dhcp6.nis-servers {{ subnet.nis_server | join(', ') }};
-        {% endif %}
-        {% if subnet.nisp_domain %}
-        option dhcp6.nisp-domain-name "{{ subnet.nisp_domain }}";
-        {% endif %}
-        {% if subnet.nisp_server %}
-        option dhcp6.nisp-servers {{ subnet.nisp_server | join(', ') }};
-        {% endif %}
-        {% if subnet.sip_address %}
-        option dhcp6.sip-servers-addresses {{ subnet.sip_address | join(', ') }};
-        {% endif %}
-        {% if subnet.sip_hostname %}
-        option dhcp6.sip-servers-names "{{ subnet.sip_hostname | join('", "') }}";
-        {% endif %}
-        {% if subnet.sntp_server %}
-        option dhcp6.sntp-servers {{ subnet.sntp_server | join(', ') }};
-        {% endif %}
-        {% for prefix in subnet.prefix_delegation %}
-        prefix6 {{ prefix.start }} {{ prefix.stop }} /{{ prefix.length }};
-        {% endfor %}
-        {% for host in subnet.static_mapping %}
-        {% if not host.disabled %}
-        host {{ network.name }}_{{ host.name }} {
-            {% if host.client_identifier %}
-            host-identifier option dhcp6.client-id {{ host.client_identifier }};
-            {% endif %}
-            {% if host.ipv6_address %}
-            fixed-address6 {{ host.ipv6_address }};
-            {% endif %}
-        }
-        {% endif %}
-        {% endfor %}
-    }
-    {% endfor %}
-    on commit {
-        set shared-networkname = "{{ network.name }}";
-    }
-}
-{% endif %}
-{% endfor %}
diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py
index c2868e078..db248de50 100755
--- a/src/conf_mode/dhcpv6_server.py
+++ b/src/conf_mode/dhcpv6_server.py
@@ -390,7 +390,7 @@ def generate(dhcpv6):
     if not dhcpv6 or dhcpv6['disabled']:
         return None
 
-    render(config_file, 'dhcpv6-server/dhcpdv6.conf.tmpl', dhcpv6)
+    render(config_file, 'dhcp-server/dhcpdv6.conf.tmpl', dhcpv6)
     return None
 
 def apply(dhcpv6):
-- 
cgit v1.2.3