Merge pull request #265 from thomas-mangin/2057-dhcp-vlan

ifconfig: T2057: break down DHCP, add register, STP and VLAN as adapters

1 files changed, 12 insertions, 270 deletions

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 4f72271c9..f2b43fd35 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -15,14 +15,11 @@
 
 import os
 import re
-import jinja2
 import json
 import glob
 import time
 from copy import deepcopy
 
-import vyos.interfaces
-
 from vyos.validate import *     # should not * include
 from vyos.config import Config  # not used anymore
 from vyos import ConfigError
@@ -35,46 +32,22 @@ from tabulate import tabulate
 from hurry.filesize import size,alternative
 from datetime import timedelta
 
-from vyos.ifconfig.control import Control
-
-dhclient_base = r'/var/lib/dhcp/dhclient_'
-dhcp_cfg = """
-# generated by ifconfig.py
-option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
-timeout 60;
-retry 300;
-
-interface "{{ intf }}" {
-    send host-name "{{ hostname }}";
-    {% if client_id -%}
-    send dhcp-client-identifier "{{ client_id }}";
-    {% endif -%}
-    {% if vendor_class_id -%}
-    send vendor-class-identifier "{{ vendor_class_id }}";
-    {% endif -%}
-    request subnet-mask, broadcast-address, routers, domain-name-servers,
-        rfc3442-classless-static-routes, domain-name, interface-mtu;
-    require subnet-mask;
-}
-
-"""
-
-dhcpv6_cfg = """
-# generated by ifconfig.py
-interface "{{ intf }}" {
-    request routers, domain-name-servers, domain-name;
-}
+from vyos.ifconfig.dhcp import DHCP
 
-"""
-
-
-
-class Interface(Control):
+class Interface(DHCP):
     options = []
     required = []
     default = {
         'type': '',
     }
+    definition = {
+        'section': '',
+        'prefixes': [],
+        'vlan': False,
+        'bondable': False,
+        'broadcast': False,
+        'bridgeable':  False,
+    }
 
     _command_set = {
         'state': {
@@ -165,6 +138,8 @@ class Interface(Control):
         >>> i = Interface('eth0')
         """
 
+        DHCP.__init__(self, ifname)
+
         self.config = deepcopy(self.default)
         self.config['ifname'] = ifname
 
@@ -183,31 +158,6 @@ class Interface(Control):
 
             self._create()
 
-        # per interface DHCP config files
-        self._dhcp_cfg_file = dhclient_base + self.config['ifname'] + '.conf'
-        self._dhcp_pid_file = dhclient_base + self.config['ifname'] + '.pid'
-        self._dhcp_lease_file = dhclient_base + self.config['ifname'] + '.leases'
-
-        # per interface DHCPv6 config files
-        self._dhcpv6_cfg_file = dhclient_base + self.config['ifname'] + '.v6conf'
-        self._dhcpv6_pid_file = dhclient_base + self.config['ifname'] + '.v6pid'
-        self._dhcpv6_lease_file = dhclient_base + self.config['ifname'] + '.v6leases'
-
-        # DHCP options
-        self._dhcp_options = {
-            'intf' : self.config['ifname'],
-            'hostname' : '',
-            'client_id' : '',
-            'vendor_class_id' : ''
-        }
-
-        # DHCPv6 options
-        self._dhcpv6_options = {
-            'intf' : self.config['ifname'],
-            'dhcpv6_prm_only' : False,
-            'dhcpv6_temporary' : False
-        }
-
         # list of assigned IP addresses
         self._addr = []
 
@@ -623,214 +573,6 @@ class Interface(Control):
                 cmd = 'ip addr del "{}" dev "{}"'.format(addr, self.config['ifname'])
                 return self._cmd(cmd)
 
-
-    def get_dhcp_options(self):
-        """
-        Return dictionary with supported DHCP options.
-
-        Dictionary should be altered and send back via set_dhcp_options()
-        so those options are applied when DHCP is run.
-        """
-        return self._dhcp_options
-
-    def set_dhcp_options(self, options):
-        """
-        Store new DHCP options used by next run of DHCP client.
-        """
-        self._dhcp_options = options
-
-    def get_dhcpv6_options(self):
-        """
-        Return dictionary with supported DHCPv6 options.
-
-        Dictionary should be altered and send back via set_dhcp_options()
-        so those options are applied when DHCP is run.
-        """
-        return self._dhcpv6_options
-
-    def set_dhcpv6_options(self, options):
-        """
-        Store new DHCP options used by next run of DHCP client.
-        """
-        self._dhcpv6_options = options
-
-    # replace dhcpv4/v6 with systemd.networkd?
-    def _set_dhcp(self):
-        """
-        Configure interface as DHCP client. The dhclient binary is automatically
-        started in background!
-
-        Example:
-
-        >>> from vyos.ifconfig import Interface
-        >>> j = Interface('eth0')
-        >>> j.set_dhcp()
-        """
-
-        dhcp = self.get_dhcp_options()
-        if not dhcp['hostname']:
-            # read configured system hostname.
-            # maybe change to vyos hostd client ???
-            with open('/etc/hostname', 'r') as f:
-                dhcp['hostname'] = f.read().rstrip('\n')
-
-        # render DHCP configuration
-        tmpl = jinja2.Template(dhcp_cfg)
-        dhcp_text = tmpl.render(dhcp)
-        with open(self._dhcp_cfg_file, 'w') as f:
-            f.write(dhcp_text)
-
-        cmd = 'start-stop-daemon'
-        cmd += ' --start '
-        cmd += ' --quiet'
-        cmd += ' --oknodo'
-        cmd += ' --pidfile ' + self._dhcp_pid_file
-        cmd += ' --exec /sbin/dhclient --'
-        # now pass arguments to dhclient binary
-        cmd += ' -4 -nw -cf {} -pf {} -lf {} {}'.format(
-            self._dhcp_cfg_file, self._dhcp_pid_file, self._dhcp_lease_file, self.config['ifname'])
-        return self._cmd(cmd)
-
-
-    def _del_dhcp(self):
-        """
-        De-configure interface as DHCP clinet. All auto generated files like
-        pid, config and lease will be removed.
-
-        Example:
-
-        >>> from vyos.ifconfig import Interface
-        >>> j = Interface('eth0')
-        >>> j.del_dhcp()
-        """
-        pid = 0
-        if os.path.isfile(self._dhcp_pid_file):
-            with open(self._dhcp_pid_file, 'r') as f:
-                pid = int(f.read())
-        else:
-            self._debug_msg('No DHCP client PID found')
-            return None
-
-        # stop dhclient, we need to call dhclient and tell it should release the
-        # aquired IP address. tcpdump tells me:
-        # 172.16.35.103.68 > 172.16.35.254.67: [bad udp cksum 0xa0cb -> 0xb943!] BOOTP/DHCP, Request from 00:50:56:9d:11:df, length 300, xid 0x620e6946, Flags [none] (0x0000)
-        #  Client-IP 172.16.35.103
-        #  Client-Ethernet-Address 00:50:56:9d:11:df
-        #  Vendor-rfc1048 Extensions
-        #    Magic Cookie 0x63825363
-        #    DHCP-Message Option 53, length 1: Release
-        #    Server-ID Option 54, length 4: 172.16.35.254
-        #    Hostname Option 12, length 10: "vyos"
-        #
-        cmd = '/sbin/dhclient -cf {} -pf {} -lf {} -r {}'.format(
-                self._dhcp_cfg_file, self._dhcp_pid_file, self._dhcp_lease_file, self.config['ifname'])
-        self._cmd(cmd)
-
-        # cleanup old config file
-        if os.path.isfile(self._dhcp_cfg_file):
-            os.remove(self._dhcp_cfg_file)
-
-        # cleanup old pid file
-        if os.path.isfile(self._dhcp_pid_file):
-            os.remove(self._dhcp_pid_file)
-
-        # cleanup old lease file
-        if os.path.isfile(self._dhcp_lease_file):
-            os.remove(self._dhcp_lease_file)
-
-
-    def _set_dhcpv6(self):
-        """
-        Configure interface as DHCPv6 client. The dhclient binary is automatically
-        started in background!
-
-        Example:
-
-        >>> from vyos.ifconfig import Interface
-        >>> j = Interface('eth0')
-        >>> j.set_dhcpv6()
-        """
-        dhcpv6 = self.get_dhcpv6_options()
-
-        # better save then sorry .. should be checked in interface script
-        # but if you missed it we are safe!
-        if dhcpv6['dhcpv6_prm_only'] and dhcpv6['dhcpv6_temporary']:
-            raise Exception('DHCPv6 temporary and parameters-only options are mutually exclusive!')
-
-        # render DHCP configuration
-        tmpl = jinja2.Template(dhcpv6_cfg)
-        dhcpv6_text = tmpl.render(dhcpv6)
-        with open(self._dhcpv6_cfg_file, 'w') as f:
-            f.write(dhcpv6_text)
-
-        # no longer accept router announcements on this interface
-        self._write_sysfs('/proc/sys/net/ipv6/conf/{}/accept_ra'
-              .format(self.config['ifname']), 0)
-
-        # assemble command-line to start DHCPv6 client (dhclient)
-        cmd = 'start-stop-daemon'
-        cmd += ' --start '
-        cmd += ' --quiet'
-        cmd += ' --oknodo'
-        cmd += ' --pidfile ' + self._dhcpv6_pid_file
-        cmd += ' --exec /sbin/dhclient --'
-        # now pass arguments to dhclient binary
-        cmd += ' -6 -nw -cf {} -pf {} -lf {}'.format(
-            self._dhcpv6_cfg_file, self._dhcpv6_pid_file, self._dhcpv6_lease_file)
-
-        # add optional arguments
-        if dhcpv6['dhcpv6_prm_only']:
-            cmd += ' -S'
-        if dhcpv6['dhcpv6_temporary']:
-            cmd += ' -T'
-
-        cmd += ' {}'.format(self.config['ifname'])
-        return self._cmd(cmd)
-
-
-    def _del_dhcpv6(self):
-        """
-        De-configure interface as DHCPv6 clinet. All auto generated files like
-        pid, config and lease will be removed.
-
-        Example:
-
-        >>> from vyos.ifconfig import Interface
-        >>> j = Interface('eth0')
-        >>> j.del_dhcpv6()
-        """
-        pid = 0
-        if os.path.isfile(self._dhcpv6_pid_file):
-            with open(self._dhcpv6_pid_file, 'r') as f:
-                pid = int(f.read())
-        else:
-            self._debug_msg('No DHCPv6 client PID found')
-            return None
-
-        # stop dhclient
-        cmd = 'start-stop-daemon'
-        cmd += ' --stop'
-        cmd += ' --oknodo'
-        cmd += ' --quiet'
-        cmd += ' --pidfile ' + self._dhcpv6_pid_file
-        self._cmd(cmd)
-
-        # accept router announcements on this interface
-        self._write_sysfs('/proc/sys/net/ipv6/conf/{}/accept_ra'
-              .format(self.config['ifname']), 1)
-
-        # cleanup old config file
-        if os.path.isfile(self._dhcpv6_cfg_file):
-            os.remove(self._dhcpv6_cfg_file)
-
-        # cleanup old pid file
-        if os.path.isfile(self._dhcpv6_pid_file):
-            os.remove(self._dhcpv6_pid_file)
-
-        # cleanup old lease file
-        if os.path.isfile(self._dhcpv6_lease_file):
-            os.remove(self._dhcpv6_lease_file)
-
     def op_show_interface_stats(self):
         stats = self.get_interface_stats()
         rx = [['bytes','packets','errors','dropped','overrun','mcast'],[stats['rx_bytes'],stats['rx_packets'],stats['rx_errors'],stats['rx_dropped'],stats['rx_over_errors'],stats['multicast']]]