5 files changed, 73 insertions, 73 deletions
diff --git a/data/templates/dhcp-client/daemon-options.j2 b/data/templates/dhcp-client/daemon-options.j2
new file mode 100644
index 000000000..b21ad08ab
--- /dev/null
+++ b/data/templates/dhcp-client/daemon-options.j2
@@ -0,0 +1,4 @@
+### Autogenerated by interface.py ###
+{% set if_metric = '-e IF_METRIC=' ~ dhcp_options.default_route_distance if dhcp_options.default_route_distance is vyos_defined else '' %}
+DHCLIENT_OPTS="-nw -cf /var/lib/dhcp/dhclient_{{ ifname }}.conf -pf /var/lib/dhcp/dhclient_{{ ifname }}.pid -lf /var/lib/dhcp/dhclient_{{ ifname }}.leases {{ if_metric }} {{ ifname }}"
+
diff --git a/data/templates/dhcp-client/daemon-options.tmpl b/data/templates/dhcp-client/daemon-options.tmpl
deleted file mode 100644
index 40629dca1..000000000
--- a/data/templates/dhcp-client/daemon-options.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-### Autogenerated by interface.py ###
-
-DHCLIENT_OPTS="-nw -cf /var/lib/dhcp/dhclient_{{ifname}}.conf -pf /var/lib/dhcp/dhclient_{{ifname}}.pid -lf /var/lib/dhcp/dhclient_{{ifname}}.leases{{" -e IF_METRIC=" ~ dhcp_options.default_route_distance if dhcp_options.default_route_distance is defined and dhcp_options.default_route_distance is not none}} {{ifname}}"
-
diff --git a/data/templates/dhcp-client/ipv4.tmpl b/data/templates/dhcp-client/ipv4.j2
index b3e74c22b..cc5ddf09c 100644
--- a/data/templates/dhcp-client/ipv4.tmpl
+++ b/data/templates/dhcp-client/ipv4.j2
@@ -7,26 +7,26 @@ initial-interval 2;
 
 interface "{{ ifname }}" {
     send host-name "{{ dhcp_options.host_name }}";
-{% if dhcp_options.client_id is defined and dhcp_options.client_id is not none %}
-{%   set client_id = dhcp_options.client_id %}
+{% if dhcp_options.client_id is vyos_defined %}
+{%     set client_id = dhcp_options.client_id %}
 {#   Use HEX representation of client-id as it is send in MAC-address style using hex characters. If not HEX, use double quotes ASCII format #}
-{%   if not dhcp_options.client_id.split(':') | length >= 5 %}
-{%     set client_id = '"' + dhcp_options.client_id + '"' %}
-{%   endif %}
-    send dhcp-client-identifier {{ client_id  }};
+{%     if not dhcp_options.client_id.split(':') | length >= 5 %}
+{%         set client_id = '"' + dhcp_options.client_id + '"' %}
+{%     endif %}
+    send dhcp-client-identifier {{ client_id }};
 {% endif %}
-{% if dhcp_options.vendor_class_id is defined and dhcp_options.vendor_class_id is not none %}
+{% if dhcp_options.vendor_class_id is vyos_defined %}
     send vendor-class-identifier "{{ dhcp_options.vendor_class_id }}";
 {% endif %}
     # The request statement causes the client to request that any server responding to the
     # client send the client its values for the specified options.
-    request subnet-mask, broadcast-address,{{ " routers," if dhcp_options.no_default_route is not defined }} domain-name-servers,
+    request subnet-mask, broadcast-address,{{ " routers," if dhcp_options.no_default_route is not vyos_defined }} domain-name-servers,
         rfc3442-classless-static-routes, domain-name, interface-mtu;
 
     # The require statement lists options that must be sent in order for an offer to be
     # accepted. Offers that do not contain all the listed options will be ignored!
     require subnet-mask;
-{% if dhcp_options.reject is defined and dhcp_options.reject is not none %}
+{% if dhcp_options.reject is vyos_defined %}
     # Block addresses coming from theses dhcp servers if configured.
     reject {{ dhcp_options.reject | join(', ') }};
 {% endif %}
diff --git a/data/templates/dhcp-client/ipv6.j2 b/data/templates/dhcp-client/ipv6.j2
new file mode 100644
index 000000000..e136b1789
--- /dev/null
+++ b/data/templates/dhcp-client/ipv6.j2
@@ -0,0 +1,60 @@
+### Autogenerated by interface.py ###
+
+# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/
+interface {{ ifname }} {
+{% if dhcpv6_options.duid is vyos_defined %}
+    send client-id {{ dhcpv6_options.duid }};
+{% endif %}
+{% if address is vyos_defined and 'dhcpv6' in address %}
+    request domain-name-servers;
+    request domain-name;
+{%     if dhcpv6_options.parameters_only is vyos_defined %}
+    information-only;
+{%     endif %}
+{%     if dhcpv6_options.temporary is not vyos_defined %}
+    send ia-na 0; # non-temporary address
+{%     endif %}
+{%     if dhcpv6_options.rapid_commit is vyos_defined %}
+    send rapid-commit; # wait for immediate reply instead of advertisements
+{%     endif %}
+{% endif %}
+{% if dhcpv6_options.pd is vyos_defined %}
+{%     for pd in dhcpv6_options.pd %}
+    send ia-pd {{ pd }}; # prefix delegation #{{ pd }}
+{%     endfor %}
+{% endif %}
+};
+
+{% if address is vyos_defined and 'dhcpv6' in address %}
+{%     if dhcpv6_options.temporary is not vyos_defined %}
+id-assoc na 0 {
+    # Identity association for non temporary address
+};
+{%     endif %}
+{% endif %}
+
+{% if dhcpv6_options.pd is vyos_defined %}
+{%     for pd, pd_config in dhcpv6_options.pd.items() %}
+id-assoc pd {{ pd }} {
+{#   length got a default value #}
+    prefix ::/{{ pd_config.length }} infinity;
+{%         set sla_len = 64 - pd_config.length | int %}
+{%         set count = namespace(value=0) %}
+{%         for interface, interface_config in pd_config.interface.items() if pd_config.interface is vyos_defined %}
+    prefix-interface {{ interface }} {
+        sla-len {{ sla_len }};
+{%             if interface_config.sla_id is vyos_defined %}
+        sla-id {{ interface_config.sla_id }};
+{%             else %}
+        sla-id {{ count.value }};
+{%             endif %}
+{%             if interface_config.address is vyos_defined %}
+        ifid {{ interface_config.address }};
+{%             endif %}
+    };
+{%             set count.value = count.value + 1 %}
+{%         endfor %}
+};
+{%     endfor %}
+{% endif %}
+
diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
deleted file mode 100644
index c292664e9..000000000
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ /dev/null
@@ -1,60 +0,0 @@
-### Autogenerated by interface.py ###
-
-# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/
-interface {{ ifname }} {
-{% if dhcpv6_options is defined and dhcpv6_options.duid is defined and dhcpv6_options.duid is not none %}
-    send client-id {{ dhcpv6_options.duid }};
-{% endif %}
-{% if address is defined and 'dhcpv6' in address %}
-    request domain-name-servers;
-    request domain-name;
-{%   if dhcpv6_options is defined and dhcpv6_options.parameters_only is defined %}
-    information-only;
-{%   endif %}
-{%   if dhcpv6_options is not defined or dhcpv6_options.temporary is not defined %}
-    send ia-na 0; # non-temporary address
-{%   endif %}
-{%   if dhcpv6_options is defined and dhcpv6_options.rapid_commit is defined %}
-    send rapid-commit; # wait for immediate reply instead of advertisements
-{%   endif %}
-{% endif %}
-{% if dhcpv6_options is defined and dhcpv6_options.pd is defined %}
-{%   for pd in dhcpv6_options.pd %}
-    send ia-pd {{ pd }}; # prefix delegation #{{ pd }}
-{%   endfor %}
-{% endif %}
-};
-
-{% if address is defined and 'dhcpv6' in address %}
-{%   if dhcpv6_options is not defined or dhcpv6_options.temporary is not defined %}
-id-assoc na 0 {
-    # Identity association for non temporary address
-};
-{%   endif %}
-{% endif %}
-
-{% if dhcpv6_options is defined and dhcpv6_options.pd is defined %}
-{%   for pd in dhcpv6_options.pd %}
-id-assoc pd {{ pd }} {
-{#   length got a default value #}
-    prefix ::/{{ dhcpv6_options.pd[pd].length }} infinity;
-{%     set sla_len = 64 - dhcpv6_options.pd[pd].length|int %}
-{%     set count = namespace(value=0) %}
-{%     for interface in dhcpv6_options.pd[pd].interface if dhcpv6_options.pd[pd].interface is defined %}
-    prefix-interface {{ interface }} {
-        sla-len {{ sla_len }};
-{%       if dhcpv6_options.pd[pd].interface[interface].sla_id is defined and dhcpv6_options.pd[pd].interface[interface].sla_id is not none %}
-        sla-id {{ dhcpv6_options.pd[pd].interface[interface].sla_id }};
-{%       else %}
-        sla-id {{ count.value }};
-{%       endif %}
-{%       if dhcpv6_options.pd[pd].interface[interface].address is defined and dhcpv6_options.pd[pd].interface[interface].address is not none %}
-        ifid {{ dhcpv6_options.pd[pd].interface[interface].address }};
-{%       endif %}
-    };
-{%      set count.value = count.value + 1 %}
-{%     endfor %}
-};
-{%   endfor %}
-{% endif %}
-