ifconfig: T2740: pass config dict to DHCP class for IPv6

This removes additional code paths as we can instatly work with the input dict
the same was as it was done for PPPoE. This fixes the entire DHCPv6-PD support
on non PPPoE interfaces as this was lost in translation while processing T2653.

5 files changed, 63 insertions, 124 deletions

diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 490f14726..112431c5f 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -4,41 +4,44 @@
 interface {{ ifname }} {
     request domain-name-servers;
     request domain-name;
-{%  if dhcpv6_prm_only %}
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.parameters_only is defined %}
     information-only;
-{%  endif %}
-{%  if not dhcpv6_temporary %}
+{%    endif %}
+{%    if dhcpv6_options.temporary is not defined %}
     send ia-na 1; # non-temporary address
-{%  endif %}
-{%  if dhcpv6_pd_interfaces %}
+{%    endif %}
+{%    if dhcpv6_options.prefix_delegation is defined %}
     send ia-pd 2; # prefix delegation
+{%    endif %}
 {%  endif %}
 };
 
-{%  if not dhcpv6_temporary %}
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.temporary is not defined %}
 id-assoc na 1 {
     # Identity association NA
 };
-{%  endif %}
+{%   endif %}
 
-{%  if dhcpv6_pd_interfaces %}
+{%   if dhcpv6_options.prefix_delegation is defined %}
 id-assoc pd 2 {
-{%  if dhcpv6_pd_length %}
-    prefix ::/{{ dhcpv6_pd_length }} infinity;
-{%  endif %}
-{%  for intf in dhcpv6_pd_interfaces %}
-    prefix-interface {{ intf.ifname }} {
-{%    if intf.sla_id %}
-        sla-id {{ intf.sla_id }};
-{%    endif %}
-{%    if intf.sla_len %}
-        sla-len {{ intf.sla_len }};
-{%    endif %}
-{%    if intf.if_id %}
-        ifid {{ intf.if_id  }};
-{%    endif %}
+{%     if dhcpv6_options.prefix_delegation.length is defined %}
+    prefix ::/{{ dhcpv6_options.prefix_delegation.length }} infinity;
+{%     endif %}
+{%     for interface in dhcpv6_options.prefix_delegation.interface %}
+    prefix-interface {{ interface }} {
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_id is defined %}
+        sla-id {{ dhcpv6_options.prefix_delegation.interface[interface].sla_id }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_len is defined %}
+        sla-len {{ dhcpv6_options.prefix_delegation.interface[interface].sla_len }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].address is defined %}
+        ifid {{ dhcpv6_options.prefix_delegation.interface[interface].address }};
+{%       endif %}
     };
-{%  endfor %}
+{%     endfor %}
 };
-{%  endif %}
-
+{%   endif %}
+{% endif %}
diff --git a/data/templates/dhcp-client/ipv6_new.tmpl b/data/templates/dhcp-client/ipv6_new.tmpl
deleted file mode 100644
index 112431c5f..000000000
--- a/data/templates/dhcp-client/ipv6_new.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-# generated by dhcp.py
-# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/
-
-interface {{ ifname }} {
-    request domain-name-servers;
-    request domain-name;
-{% if dhcpv6_options is defined %}
-{%   if dhcpv6_options.parameters_only is defined %}
-    information-only;
-{%    endif %}
-{%    if dhcpv6_options.temporary is not defined %}
-    send ia-na 1; # non-temporary address
-{%    endif %}
-{%    if dhcpv6_options.prefix_delegation is defined %}
-    send ia-pd 2; # prefix delegation
-{%    endif %}
-{%  endif %}
-};
-
-{% if dhcpv6_options is defined %}
-{%   if dhcpv6_options.temporary is not defined %}
-id-assoc na 1 {
-    # Identity association NA
-};
-{%   endif %}
-
-{%   if dhcpv6_options.prefix_delegation is defined %}
-id-assoc pd 2 {
-{%     if dhcpv6_options.prefix_delegation.length is defined %}
-    prefix ::/{{ dhcpv6_options.prefix_delegation.length }} infinity;
-{%     endif %}
-{%     for interface in dhcpv6_options.prefix_delegation.interface %}
-    prefix-interface {{ interface }} {
-{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_id is defined %}
-        sla-id {{ dhcpv6_options.prefix_delegation.interface[interface].sla_id }};
-{%       endif %}
-{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_len is defined %}
-        sla-len {{ dhcpv6_options.prefix_delegation.interface[interface].sla_len }};
-{%       endif %}
-{%       if dhcpv6_options.prefix_delegation.interface[interface].address is defined %}
-        ifid {{ dhcpv6_options.prefix_delegation.interface[interface].address }};
-{%       endif %}
-    };
-{%     endfor %}
-};
-{%   endif %}
-{% endif %}
diff --git a/python/vyos/ifconfig/dhcp.py b/python/vyos/ifconfig/dhcp.py
index a8b9a2a87..bd37970a2 100644
--- a/python/vyos/ifconfig/dhcp.py
+++ b/python/vyos/ifconfig/dhcp.py
@@ -15,6 +15,7 @@
 
 import os
 
+from vyos.configverify import verify_dhcpv6
 from vyos.dicts import FixedDict
 from vyos.ifconfig.control import Control
 from vyos.template import render
@@ -82,39 +83,31 @@ class _DHCPv4 (Control):
 class _DHCPv6 (Control):
     def __init__(self, ifname):
         super().__init__()
-        self.options = FixedDict(**{
-            'ifname': ifname,
-            'dhcpv6_prm_only': False,
-            'dhcpv6_temporary': False,
-            'dhcpv6_pd_interfaces': [],
-            'dhcpv6_pd_length': ''
-        })
-        self._conf_file = f'/run/dhcp6c/dhcp6c.{ifname}.conf'
+        self.options = {'ifname' : ifname}
+        self._config = f'/run/dhcp6c/dhcp6c.{ifname}.conf'
 
     def set(self):
         """
-        Configure interface as DHCPv6 client. The dhclient binary is automatically
-        started in background!
+        Configure interface as DHCPv6 client. The client is automatically
+        started in background when address is configured as DHCP.
 
         Example:
-
         >>> from vyos.ifconfig import Interface
         >>> j = Interface('eth0')
         >>> j.dhcp.v6.set()
         """
 
-        # better save then sorry .. should be checked in interface script
-        # but if you missed it we are safe!
-        if self.options['dhcpv6_prm_only'] and self.options['dhcpv6_temporary']:
-            raise Exception(
-                'DHCPv6 temporary and parameters-only options are mutually exclusive!')
+        # better save then sorry .. should be checked in interface script but if you
+        # missed it we are safe!
+        verify_dhcpv6(self.options)
 
-        render(self._conf_file, 'dhcp-client/ipv6.tmpl', self.options, trim_blocks=True)
-        return self._cmd('systemctl restart dhcp6c@{ifname}.service'.format(**self.options))
+        render(self._config, 'dhcp-client/ipv6.tmpl', self.options, trim_blocks=True)
+        return self._cmd('systemctl restart dhcp6c@{ifname}.service'.format(
+            **self.options))
 
     def delete(self):
         """
-        De-configure interface as DHCPv6 clinet. All auto generated files like
+        De-configure interface as DHCPv6 client. All auto generated files like
         pid, config and lease will be removed.
 
         Example:
@@ -126,9 +119,8 @@ class _DHCPv6 (Control):
         self._cmd('systemctl stop dhcp6c@{ifname}.service'.format(**self.options))
 
         # cleanup old config files
-        if os.path.isfile(self._conf_file):
-            os.remove(self._conf_file)
-
+        if os.path.isfile(self._config):
+            os.remove(self._config)
 
 class DHCP(object):
     def __init__(self, ifname):
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index d477153e8..f5e43e172 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -822,6 +822,22 @@ class Interface(Control):
         value = '2' if 'disable_link_detect' in config else '1'
         self.set_link_detect(value)
 
+        # DHCP options
+        if 'dhcp_options' in config:
+            dhcp_options = config.get('dhcp_options')
+            if 'client_id' in dhcp_options:
+                self.dhcp.v4.options['client_id'] = dhcp_options.get('client_id')
+
+            if 'host_name' in dhcp_options:
+                self.dhcp.v4.options['hostname'] = dhcp_options.get('host_name')
+
+            if 'vendor_class_id' in dhcp_options:
+                self.dhcp.v4.options['vendor_class_id'] = dhcp_options.get('vendor_class_id')
+
+        # DHCPv6 options
+        if 'dhcpv6_options' in config:
+            self.dhcp.v6.options = config
+
         # Configure assigned interface IP addresses. No longer
         # configured addresses will be removed first
         new_addr = config.get('address', [])
@@ -849,35 +865,6 @@ class Interface(Control):
             # checked before
             self.set_vrf(config.get('vrf', ''))
 
-        # DHCP options
-        if 'dhcp_options' in config:
-            dhcp_options = config.get('dhcp_options')
-            if 'client_id' in dhcp_options:
-                self.dhcp.v4.options['client_id'] = dhcp_options.get('client_id')
-
-            if 'host_name' in dhcp_options:
-                self.dhcp.v4.options['hostname'] = dhcp_options.get('host_name')
-
-            if 'vendor_class_id' in dhcp_options:
-                self.dhcp.v4.options['vendor_class_id'] = dhcp_options.get('vendor_class_id')
-
-        # DHCPv6 options
-        if 'dhcpv6_options' in config:
-            dhcpv6_options = config.get('dhcpv6_options')
-            if 'parameters_only' in dhcpv6_options:
-                self.dhcp.v6.options['dhcpv6_prm_only'] = True
-
-            if 'temporary' in dhcpv6_options:
-                self.dhcp.v6.options['dhcpv6_temporary'] = True
-
-            if 'prefix_delegation' in dhcpv6_options:
-                prefix_delegation = dhcpv6_options.get('prefix_delegation')
-                if 'length' in prefix_delegation:
-                    self.dhcp.v6.options['dhcpv6_pd_length'] = prefix_delegation.get('length')
-
-                if 'interface' in prefix_delegation:
-                    self.dhcp.v6.options['dhcpv6_pd_interfaces'] = prefix_delegation.get('interface')
-
         # Configure ARP cache timeout in milliseconds - has default value
         tmp = jmespath.search('ip.arp_cache_timeout', config)
         value = tmp if (tmp != None) else '30'
@@ -982,9 +969,11 @@ class Interface(Control):
             self.del_vlan(vif_s_id)
 
         # create/update 802.1ad (Q-in-Q VLANs)
+        ifname = config['ifname']
         for vif_s_id, vif_s in config.get('vif_s', {}).items():
             tmp=get_ethertype(vif_s.get('ethertype', '0x88A8'))
             s_vlan = self.add_vlan(vif_s_id, ethertype=tmp)
+            vif_s['ifname'] = f'{ifname}.{vif_s_id}'
             s_vlan.update(vif_s)
 
             # remove no longer required client VLAN (vif-c)
@@ -994,6 +983,7 @@ class Interface(Control):
             # create/update client VLAN (vif-c) interface
             for vif_c_id, vif_c in vif_s.get('vif_c', {}).items():
                 c_vlan = s_vlan.add_vlan(vif_c_id)
+                vif_c['ifname'] = f'{ifname}.{vif_s_id}.{vif_c_id}'
                 c_vlan.update(vif_c)
 
         # remove no longer required 802.1q VLAN interfaces
@@ -1003,4 +993,5 @@ class Interface(Control):
         # create/update 802.1q VLAN interfaces
         for vif_id, vif in config.get('vif', {}).items():
             vlan = self.add_vlan(vif_id)
+            vif['ifname'] = f'{ifname}.{vif_id}'
             vlan.update(vif)
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index b9a88a949..928113b49 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -108,7 +108,7 @@ def generate(pppoe):
     if tmp and len(tmp) > 0:
         # ipv6.tmpl relies on ifname - this should be made consitent in the
         # future better then double key-ing the same value
-        render(config_wide_dhcp6c, 'dhcp-client/ipv6_new.tmpl', pppoe, trim_blocks=True)
+        render(config_wide_dhcp6c, 'dhcp-client/ipv6.tmpl', pppoe, trim_blocks=True)
 
     return None