diff --git a/python/vyos/ifconfig.py b/python/vyos/ifconfig.py
index 1f8612681..749bc6a1a 100644
--- a/python/vyos/ifconfig.py
+++ b/python/vyos/ifconfig.py
@@ -1,1617 +1,1603 @@
 # Copyright 2019 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import re
 import jinja2
 
 from vyos.validate import *
 from ipaddress import IPv4Network, IPv6Address
 from netifaces import ifaddresses, AF_INET, AF_INET6
 from subprocess import Popen, PIPE, STDOUT
 from time import sleep
 
 dhcp_cfg = """
 # generated by ifconfig.py
 option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
 interface "{{ intf }}" {
     send host-name "{{ hostname }}";
     request subnet-mask, broadcast-address, routers, domain-name-servers, rfc3442-classless-static-routes, domain-name, interface-mtu;
 }
 """
 
 dhcpv6_cfg = """
 # generated by ifconfig.py
 interface "{{ intf }}" {
     request routers, domain-name-servers, domain-name;
 }
 """
 
 dhclient_base = r'/var/lib/dhcp/dhclient_'
 
 
 class Interface:
     def __init__(self, ifname, type=None):
         """
         This is the base interface class which supports basic IP/MAC address
         operations as well as DHCP(v6). Other interface which represent e.g.
         and ethernet bridge are implemented as derived classes adding all
         additional functionality.
 
         DEBUG:
         This class has embedded debugging (print) which can be enabled by
         creating the following file:
         vyos@vyos# touch /tmp/vyos.ifconfig.debug
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> i = Interface('eth0')
         """
         self._ifname = str(ifname)
         self._state = 'down'
 
         if not os.path.exists('/sys/class/net/{}'.format(ifname)) and not type:
             raise Exception('interface "{}" not found'.format(self._ifname))
 
         if not os.path.exists('/sys/class/net/{}'.format(self._ifname)):
             cmd = 'ip link add dev {} type {}'.format(self._ifname, type)
             self._cmd(cmd)
 
         # per interface DHCP config files
         self._dhcp_cfg_file = dhclient_base + self._ifname + '.conf'
         self._dhcp_pid_file = dhclient_base + self._ifname + '.pid'
         self._dhcp_lease_file = dhclient_base + self._ifname + '.leases'
 
         # per interface DHCPv6 config files
         self._dhcpv6_cfg_file = dhclient_base + self._ifname + '.v6conf'
         self._dhcpv6_pid_file = dhclient_base + self._ifname + '.v6pid'
         self._dhcpv6_lease_file = dhclient_base + self._ifname + '.v6leases'
 
     def _debug_msg(self, msg):
         if os.path.isfile('/tmp/vyos.ifconfig.debug'):
             print('DEBUG/{:<6} {}'.format(self._ifname, msg))
 
     def _cmd(self, command):
         p = Popen(command, stdout=PIPE, stderr=STDOUT, shell=True)
         tmp = p.communicate()[0].strip()
         self._debug_msg("cmd '{}'".format(command))
         if tmp.decode():
             self._debug_msg("returned:\n{}".format(tmp.decode()))
 
         # do we need some error checking code here?
         return tmp
 
     def _read_sysfs(self, filename):
         """
         Provide a single primitive w/ error checking for reading from sysfs.
         """
         value = None
         with open(filename, 'r') as f:
             value = f.read().rstrip('\n')
 
         self._debug_msg("read '{}' < '{}'".format(value, filename))
         return value
 
     def _write_sysfs(self, filename, value):
         """
         Provide a single primitive w/ error checking for writing to sysfs.
         """
         self._debug_msg("write '{}' > '{}'".format(value, filename))
         with open(filename, 'w') as f:
             f.write(str(value))
 
         return None
 
     def remove(self):
         """
         Remove interface from operating system. Removing the interface
         deconfigures all assigned IP addresses and clear possible DHCP(v6)
         client processes.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> i = Interface('eth0')
         >>> i.remove()
         """
         # stop DHCP(v6) if running
         self._del_dhcp()
         self._del_dhcpv6()
 
         # remove all assigned IP addresses from interface - this is a bit redundant
         # as the kernel will remove all addresses on interface deletion, but we
         # can not delete ALL interfaces, see below
         for addr in self.get_addr():
             self.del_addr(addr)
 
         # Ethernet interfaces can not be removed
         if type(self) == type(EthernetIf(self._ifname)):
             return
 
         # NOTE (Improvement):
         # after interface removal no other commands should be allowed
         # to be called and instead should raise an Exception:
         cmd = 'ip link del dev {}'.format(self._ifname)
         self._cmd(cmd)
 
     def get_mtu(self):
         """
         Get/set interface mtu in bytes.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').get_mtu()
         '1500'
         """
         return self._read_sysfs('/sys/class/net/{}/mtu'
                                 .format(self._ifname))
 
     def set_mtu(self, mtu):
         """
         Get/set interface mtu in bytes.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').set_mtu(1400)
         >>> Interface('eth0').get_mtu()
         '1400'
         """
         if mtu < 68 or mtu > 9000:
             raise ValueError('Invalid MTU size: "{}"'.format(mru))
 
         return self._write_sysfs('/sys/class/net/{}/mtu'
                                  .format(self._ifname), mtu)
 
     def set_mac(self, mac):
         """
         Set interface MAC (Media Access Contrl) address to given value.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').set_mac('00:50:ab:cd:ef:01')
         """
         # on interface removal (ethernet) an empty string is passed - ignore it
         if not mac:
             return None
 
         # a mac address consits out of 6 octets
         octets = len(mac.split(':'))
         if octets != 6:
             raise ValueError('wrong number of MAC octets: {} '.format(octets))
 
         # validate against the first mac address byte if it's a multicast
         # address
         if int(mac.split(':')[0], 16) & 1:
             raise ValueError('{} is a multicast MAC address'.format(mac))
 
         # overall mac address is not allowed to be 00:00:00:00:00:00
         if sum(int(i, 16) for i in mac.split(':')) == 0:
             raise ValueError('00:00:00:00:00:00 is not a valid MAC address')
 
         # check for VRRP mac address
         if mac.split(':')[0] == '0' and addr.split(':')[1] == '0' and mac.split(':')[2] == '94' and mac.split(':')[3] == '0' and mac.split(':')[4] == '1':
             raise ValueError('{} is a VRRP MAC address'.format(mac))
 
         # Assemble command executed on system. Unfortunately there is no way
         # of altering the MAC address via sysfs
         cmd = 'ip link set dev {} address {}'.format(self._ifname, mac)
         self._cmd(cmd)
 
     @property
     def arp_cache_tmo(self):
         """
         Get configured ARP cache timeout value from interface in seconds.
         Internal Kernel representation is in milliseconds.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').arp_cache_tmo
         '30'
         """
         return (self._read_sysfs('/proc/sys/net/ipv4/neigh/{0}/base_reachable_time_ms'
                                  .format(self._ifname)) / 1000)
 
     @arp_cache_tmo.setter
     def arp_cache_tmo(self, tmo):
         """
         Set ARP cache timeout value in seconds. Internal Kernel representation
         is in milliseconds.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').arp_cache_tmo = '40'
         """
         return self._write_sysfs('/proc/sys/net/ipv4/neigh/{0}/base_reachable_time_ms'
                                  .format(self._ifname), (int(tmo) * 1000))
 
-    @property
-    def link_detect(self):
-        """
-        How does the kernel act when receiving packets on 'down' interfaces
-
-        Example:
-        >>> from vyos.ifconfig import Interface
-        >>> Interface('eth0').link_detect
-        '0'
-        """
-        return self._read_sysfs('/proc/sys/net/ipv4/conf/{0}/link_filter'
-                                .format(self._ifname))
-
-    @link_detect.setter
-    def link_detect(self, link_filter):
+    def set_link_detect(self, link_filter):
         """
-        Konfigure kernel response in packets received on interfaces that are 'down'
+        Configure kernel response in packets received on interfaces that are 'down'
 
         0 - Allow packets to be received for the address on this interface
             even if interface is disabled or no carrier.
 
         1 - Ignore packets received if interface associated with the incoming
             address is down.
 
         2 - Ignore packets received if interface associated with the incoming
             address is down or has no carrier.
 
         Default value is 0. Note that some distributions enable it in startup
         scripts.
 
         Example:
         >>> from vyos.ifconfig import Interface
-        >>> Interface('eth0').link_detect = '1'
+        >>> Interface('eth0').set_link_detect(1)
         """
-        if link_filter >= 0 and link_filter <= 2:
+        if int(link_filter) >= 0 and int(link_filter) <= 2:
             return self._write_sysfs('/proc/sys/net/ipv4/conf/{0}/link_filter'
                                      .format(self._ifname), link_filter)
         else:
             raise ValueError("Value out of range")
 
     @property
     def ifalias(self):
         """
         Get/set interface alias name
 
         Example:
 
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').ifalias
         ''
         """
         return self._read_sysfs('/sys/class/net/{}/ifalias'
                                 .format(self._ifname))
 
     @ifalias.setter
     def ifalias(self, ifalias=None):
         """
         Get/set interface alias name
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').ifalias = 'VyOS upstream interface'
         >>> Interface('eth0').ifalias
         'VyOS upstream interface'
 
         to clear interface alias e.g. delete it use:
 
         >>> Interface('eth0').ifalias = ''
         >>> Interface('eth0').ifalias
         ''
         """
         if not ifalias:
             # clear interface alias
             ifalias = '\0'
 
         self._write_sysfs('/sys/class/net/{}/ifalias'
                           .format(self._ifname), ifalias)
 
     @property
     def state(self):
         """
         Enable (up) / Disable (down) an interface
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').state
         'up'
         """
         return self._read_sysfs('/sys/class/net/{}/operstate'
                                 .format(self._ifname))
 
     @state.setter
     def state(self, state):
         """
         Enable (up) / Disable (down) an interface
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').state = 'down'
         >>> Interface('eth0').state
         'down'
         """
         if state not in ['up', 'down']:
             raise ValueError('state must be "up" or "down"')
 
         self._state = state
 
         # Assemble command executed on system. Unfortunately there is no way
         # to up/down an interface via sysfs
         cmd = 'ip link set dev {} {}'.format(self._ifname, state)
         self._cmd(cmd)
 
     @property
     def proxy_arp(self):
         """
         Get current proxy ARP configuration from sysfs. Default: 0
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').proxy_arp
         '0'
         """
         return self._read_sysfs('/proc/sys/net/ipv4/conf/{}/proxy_arp'
                                 .format(self._ifname))
 
     @proxy_arp.setter
     def proxy_arp(self, enable):
         """
         Set per interface proxy ARP configuration
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').proxy_arp = 1
         >>> Interface('eth0').proxy_arp
         '1'
         """
         if int(enable) >= 0 and int(enable) <= 1:
             return self._write_sysfs('/proc/sys/net/ipv4/conf/{}/proxy_arp'
                                      .format(self._ifname), enable)
         else:
             raise ValueError("Value out of range")
 
     @property
     def proxy_arp_pvlan(self):
         """
         Private VLAN proxy arp.
         Basically allow proxy arp replies back to the same interface
         (from which the ARP request/solicitation was received).
 
         This is done to support (ethernet) switch features, like RFC
         3069, where the individual ports are NOT allowed to
         communicate with each other, but they are allowed to talk to
         the upstream router.  As described in RFC 3069, it is possible
         to allow these hosts to communicate through the upstream
         router by proxy_arp'ing. Don't need to be used together with
         proxy_arp.
 
         This technology is known by different names:
         In RFC 3069 it is called VLAN Aggregation.
         Cisco and Allied Telesyn call it Private VLAN.
         Hewlett-Packard call it Source-Port filtering or port-isolation.
         Ericsson call it MAC-Forced Forwarding (RFC Draft).
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').proxy_arp_pvlan
         '0'
         """
         return self._read_sysfs('/proc/sys/net/ipv4/conf/{}/proxy_arp_pvlan'
                                 .format(self._ifname))
 
     @proxy_arp_pvlan.setter
     def proxy_arp_pvlan(self, enable):
         """
         Private VLAN proxy arp.
         Basically allow proxy arp replies back to the same interface
         (from which the ARP request/solicitation was received).
 
         This is done to support (ethernet) switch features, like RFC
         3069, where the individual ports are NOT allowed to
         communicate with each other, but they are allowed to talk to
         the upstream router.  As described in RFC 3069, it is possible
         to allow these hosts to communicate through the upstream
         router by proxy_arp'ing. Don't need to be used together with
         proxy_arp.
 
         This technology is known by different names:
         In RFC 3069 it is called VLAN Aggregation.
         Cisco and Allied Telesyn call it Private VLAN.
         Hewlett-Packard call it Source-Port filtering or port-isolation.
         Ericsson call it MAC-Forced Forwarding (RFC Draft).
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').proxy_arp_pvlan = 1
         >>> Interface('eth0').proxy_arp_pvlan
         '1'
         """
         if int(enable) >= 0 and int(enable) <= 1:
             return self._write_sysfs('/proc/sys/net/ipv4/conf/{}/proxy_arp_pvlan'
                                      .format(self._ifname), enable)
         else:
             raise ValueError("Value out of range")
 
     def get_addr(self):
         """
         Retrieve assigned IPv4 and IPv6 addresses from given interface.
         This is done using the netifaces and ipaddress python modules.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').get_addrs()
         ['172.16.33.30/24', 'fe80::20c:29ff:fe11:a174/64']
         """
 
         ipv4 = []
         ipv6 = []
 
         if AF_INET in ifaddresses(self._ifname).keys():
             for v4_addr in ifaddresses(self._ifname)[AF_INET]:
                 # we need to manually assemble a list of IPv4 address/prefix
                 prefix = '/' + \
                     str(IPv4Network('0.0.0.0/' + v4_addr['netmask']).prefixlen)
                 ipv4.append(v4_addr['addr'] + prefix)
 
         if AF_INET6 in ifaddresses(self._ifname).keys():
             for v6_addr in ifaddresses(self._ifname)[AF_INET6]:
                 # Note that currently expanded netmasks are not supported. That means
                 # 2001:db00::0/24 is a valid argument while 2001:db00::0/ffff:ff00:: not.
                 # see https://docs.python.org/3/library/ipaddress.html
                 bits = bin(
                     int(v6_addr['netmask'].replace(':', ''), 16)).count('1')
                 prefix = '/' + str(bits)
 
                 # we alsoneed to remove the interface suffix on link local
                 # addresses
                 v6_addr['addr'] = v6_addr['addr'].split('%')[0]
                 ipv6.append(v6_addr['addr'] + prefix)
 
         return ipv4 + ipv6
 
     def add_addr(self, addr):
         """
         Add IP(v6) address to interface. Address is only added if it is not
         already assigned to that interface.
 
         addr: can be an IPv4 address, IPv6 address, dhcp or dhcpv6!
               IPv4: add IPv4 address to interface
               IPv6: add IPv6 address to interface
               dhcp: start dhclient (IPv4) on interface
               dhcpv6: start dhclient (IPv6) on interface
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> j = Interface('eth0')
         >>> j.add_addr('192.0.2.1/24')
         >>> j.add_addr('2001:db8::ffff/64')
         >>> j.get_addr()
         ['192.0.2.1/24', '2001:db8::ffff/64']
         """
         if addr == 'dhcp':
             self._set_dhcp()
         elif addr == 'dhcpv6':
             self._set_dhcpv6()
         else:
             if not is_intf_addr_assigned(self._ifname, addr):
                 cmd = 'ip addr add "{}" dev "{}"'.format(addr, self._ifname)
                 self._cmd(cmd)
 
     def del_addr(self, addr):
         """
         Delete IP(v6) address to interface. Address is only added if it is
         assigned to that interface.
 
         addr: can be an IPv4 address, IPv6 address, dhcp or dhcpv6!
               IPv4: delete IPv4 address from interface
               IPv6: delete IPv6 address from interface
               dhcp: stop dhclient (IPv4) on interface
               dhcpv6: stop dhclient (IPv6) on interface
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> j = Interface('eth0')
         >>> j.add_addr('2001:db8::ffff/64')
         >>> j.add_addr('192.0.2.1/24')
         >>> j.get_addr()
         ['192.0.2.1/24', '2001:db8::ffff/64']
         >>> j.del_addr('192.0.2.1/24')
         >>> j.get_addr()
         ['2001:db8::ffff/64']
         """
         if addr == 'dhcp':
             self._del_dhcp()
         elif addr == 'dhcpv6':
             self._del_dhcpv6()
         else:
             if is_intf_addr_assigned(self._ifname, addr):
                 cmd = 'ip addr del "{}" dev "{}"'.format(addr, self._ifname)
                 self._cmd(cmd)
 
     # 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 = {
             'hostname': 'vyos',
             'intf': self._ifname
         }
 
         # 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)
 
         if self._state == 'up':
             cmd  = 'start-stop-daemon --start --quiet --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._ifname)
             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._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 = {
             'intf': self._ifname
         }
 
         # 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)
 
         if self._state == 'up':
             # https://bugs.launchpad.net/ubuntu/+source/ifupdown/+bug/1447715
             #
             # wee need to wait for IPv6 DAD to finish once and interface is added
             # this suxx :-(
             sleep(5)
 
             # no longer accept router announcements on this interface
             cmd = 'sysctl -q -w net.ipv6.conf.{}.accept_ra=0'.format(self._ifname)
             self._cmd(cmd)
 
             # assemble command-line to start DHCPv6 client (dhclient)
             cmd  = 'start-stop-daemon --start --quiet --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, self._ifname)
             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 --stop --quiet --pidfile {}'.format(
             self._dhcpv6_pid_file)
         self._cmd(cmd)
 
         # accept router announcements on this interface
         cmd = 'sysctl -q -w net.ipv6.conf.{}.accept_ra=1'.format(self._ifname)
         self._cmd(cmd)
 
         # 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)
 
 
 class LoopbackIf(Interface):
 
     """
     The loopback device is a special, virtual network interface that your router
     uses to communicate with itself.
     """
 
     def __init__(self, ifname):
         super().__init__(ifname, type='loopback')
 
 
 class DummyIf(Interface):
 
     """
     A dummy interface is entirely virtual like, for example, the loopback
     interface. The purpose of a dummy interface is to provide a device to route
     packets through without actually transmitting them.
     """
 
     def __init__(self, ifname):
         super().__init__(ifname, type='dummy')
 
 
 class BridgeIf(Interface):
 
     """
     A bridge is a way to connect two Ethernet segments together in a protocol
     independent way. Packets are forwarded based on Ethernet address, rather
     than IP address (like a router). Since forwarding is done at Layer 2, all
     protocols can go transparently through a bridge.
 
     The Linux bridge code implements a subset of the ANSI/IEEE 802.1d standard.
     """
 
     def __init__(self, ifname):
         super().__init__(ifname, type='bridge')
 
     def set_ageing_time(self, time):
         """
         Set bridge interface MAC address aging time in seconds. Internal kernel
         representation is in centiseconds. Kernel default is 300 seconds.
 
         Example:
         >>> from vyos.ifconfig import BridgeIf
         >>> BridgeIf('br0').ageing_time(2)
         """
         time = int(time) * 100
         return self._write_sysfs('/sys/class/net/{}/bridge/ageing_time'
                                  .format(self._ifname), time)
 
     def set_forward_delay(self, time):
         """
         Set bridge forwarding delay in seconds. Internal Kernel representation
         is in centiseconds.
 
         Example:
         >>> from vyos.ifconfig import BridgeIf
         >>> BridgeIf('br0').forward_delay(15)
         """
         return self._write_sysfs('/sys/class/net/{}/bridge/forward_delay'
                                  .format(self._ifname), (int(time) * 100))
 
     def set_hello_time(self, time):
         """
         Set bridge hello time in seconds. Internal Kernel representation
         is in centiseconds.
 
         Example:
         >>> from vyos.ifconfig import BridgeIf
         >>> BridgeIf('br0').set_hello_time(2)
         """
         return self._write_sysfs('/sys/class/net/{}/bridge/hello_time'
                                  .format(self._ifname), (int(time) * 100))
 
     def set_max_age(self, time):
         """
         Set bridge max message age in seconds. Internal Kernel representation
         is in centiseconds.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> BridgeIf('br0').set_max_age(30)
         """
         return self._write_sysfs('/sys/class/net/{}/bridge/max_age'
                                  .format(self._ifname), (int(time) * 100))
 
     def set_priority(self, priority):
         """
         Set bridge max aging time in seconds.
 
         Example:
         >>> from vyos.ifconfig import BridgeIf
         >>> BridgeIf('br0').set_priority(8192)
         """
         return self._write_sysfs('/sys/class/net/{}/bridge/priority'
                                  .format(self._ifname), priority)
 
     def set_stp(self, state):
         """
         Set bridge STP (Spanning Tree) state. 0 -> STP disabled, 1 -> STP enabled
 
         Example:
         >>> from vyos.ifconfig import BridgeIf
         >>> BridgeIf('br0').set_stp(1)
         """
 
         if int(state) >= 0 and int(state) <= 1:
             return self._write_sysfs('/sys/class/net/{}/bridge/stp_state'
                                      .format(self._ifname), state)
         else:
             raise ValueError("Value out of range")
 
 
     def set_multicast_querier(self, enable):
         """
         Sets whether the bridge actively runs a multicast querier or not. When a
         bridge receives a 'multicast host membership' query from another network
         host, that host is tracked based on the time that the query was received
         plus the multicast query interval time.
 
         Use enable=1 to enable or enable=0 to disable
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> BridgeIf('br0').set_multicast_querier(1)
         """
         if int(enable) >= 0 and int(enable) <= 1:
             return self._write_sysfs('/sys/class/net/{}/bridge/multicast_querier'
                                      .format(self._ifname), enable)
         else:
             raise ValueError("Value out of range")
 
 
     def add_port(self, interface):
         """
         Add physical interface to bridge (member port)
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> BridgeIf('br0').add_port('eth0')
         >>> BridgeIf('br0').add_port('eth1')
         """
         cmd = 'ip link set dev {} master {}'.format(interface, self._ifname)
         self._cmd(cmd)
 
     def del_port(self, interface):
         """
         Remove member port from bridge instance.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> BridgeIf('br0').del_port('eth1')
         """
         cmd = 'ip link set dev {} nomaster'.format(interface)
         self._cmd(cmd)
 
     def set_path_cost(self, interface, cost):
         """
         Set interface path cost, only relevant for STP enabled interfaces
 
         Example:
 
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').path_cost(4)
         """
         return self._write_sysfs('/sys/class/net/{}/brif/{}/path_cost'
                                  .format(self._ifname, interface), cost)
 
     def set_path_priority(self, interface, priority):
         """
         Set interface path priority, only relevant for STP enabled interfaces
 
         Example:
 
         >>> from vyos.ifconfig import Interface
         >>> Interface('eth0').priority(4)
         """
         return self._write_sysfs('/sys/class/net/{}/brif/{}/priority'
                                  .format(self._ifname, interface), priority)
 
 
 class VLANIf(Interface):
     """
     This class handels the creation and removal of a VLAN interface. It serves
     as base class for BondIf and EthernetIf.
     """
     def __init__(self, ifname, type=None):
         super().__init__(ifname, type)
 
     def remove(self):
         """
         Remove interface from operating system. Removing the interface
         deconfigures all assigned IP addresses and clear possible DHCP(v6)
         client processes.
 
         Example:
         >>> from vyos.ifconfig import Interface
         >>> i = Interface('eth0')
         >>> i.remove()
         """
         # do we have sub interfaces (VLANs)?
         # we apply a regex matching subinterfaces (indicated by a .) of a
         # parent interface. 'bond0(?:\.\d+){1,2}' will match vif and vif-s/vif-c
         # subinterfaces
         vlan_ifs = [f for f in os.listdir(r'/sys/class/net') \
                        if re.match(self._ifname + r'(?:\.\d+){1,2}', f)]
 
         for vlan in vlan_ifs:
             Interface(vlan).remove()
 
         # All subinterfaces are now removed, continue on the physical interface
         super().remove()
 
 
     def add_vlan(self, vlan_id, ethertype='', ingress_qos='', egress_qos=''):
         """
         A virtual LAN (VLAN) is any broadcast domain that is partitioned and
         isolated in a computer network at the data link layer (OSI layer 2).
         Use this function to create a new VLAN interface on a given physical
         interface.
 
         This function creates both 802.1q and 802.1ad (Q-in-Q) interfaces. Proto
         parameter is used to indicate VLAN type.
 
         A new object of type VLANIf is returned once the interface has been
         created.
 
         @param ethertype: If specified, create 802.1ad or 802.1q Q-in-Q VLAN
                           interface
         @param ingress_qos: Defines a mapping of VLAN header prio field to the
                             Linux internal packet priority on incoming frames.
         @param ingress_qos: Defines a mapping of Linux internal packet priority
                             to VLAN header prio field but for outgoing frames.
 
         Example:
         >>> from vyos.ifconfig import VLANIf
         >>> i = VLANIf('eth0')
         >>> i.add_vlan(10)
         """
         vlan_ifname = self._ifname + '.' + str(vlan_id)
         if not os.path.exists('/sys/class/net/{}'.format(vlan_ifname)):
             self._vlan_id = int(vlan_id)
 
             if ethertype:
                 self._ethertype = ethertype
                 ethertype = 'proto {}'.format(ethertype)
 
             # Optional ingress QOS mapping
             opt_i = ''
             if ingress_qos:
                 opt_i = 'ingress-qos-map ' + ingress_qos
             # Optional egress QOS mapping
             opt_e = ''
             if egress_qos:
                 opt_e = 'egress-qos-map ' + egress_qos
 
             # create interface in the system
             cmd = 'ip link add link {intf} name {intf}.{vlan} type vlan {proto} id {vlan} {opt_e} {opt_i}' \
                    .format(intf=self._ifname, vlan=self._vlan_id, proto=ethertype, opt_e=opt_e, opt_i=opt_i)
             self._cmd(cmd)
 
         # return new object mapping to the newly created interface
         # we can now work on this object for e.g. IP address setting
         # or interface description and so on
         return VLANIf(vlan_ifname)
 
 
     def del_vlan(self, vlan_id):
         """
         Remove VLAN interface from operating system. Removing the interface
         deconfigures all assigned IP addresses and clear possible DHCP(v6)
         client processes.
 
         Example:
         >>> from vyos.ifconfig import VLANIf
         >>> i = VLANIf('eth0.10')
         >>> i.del_vlan()
         """
         vlan_ifname = self._ifname + '.' + str(vlan_id)
         tmp = VLANIf(vlan_ifname)
         tmp.remove()
 
 
 class EthernetIf(VLANIf):
     """
     Abstraction of a Linux Ethernet Interface
     """
     def __init__(self, ifname):
         super().__init__(ifname)
 
     def get_driver_name(self):
         """
         Return the driver name used by NIC. Some NICs don't support all
         features e.g. changing link-speed, duplex
 
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.get_driver_name()
         'vmxnet3'
         """
         link = os.readlink('/sys/class/net/{}/device/driver/module'.format(self._ifname))
         return os.path.basename(link)
 
 
     def has_autoneg(self):
         """
         Not all drivers support autonegotiation.
 
         returns True -> Autonegotiation is supported by driver
                 False -> Autonegotiation is not supported by driver
 
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.has_autoneg()
         'True'
         """
         regex = 'Supports auto-negotiation:[ ]\w+'
         tmp = self._cmd('/sbin/ethtool {}'.format(self._ifname))
         tmp = re.search(regex, tmp.decode())
 
         # Output is either 'Supports auto-negotiation: Yes' or
         # 'Supports auto-negotiation: No'
         if tmp.group().split(':')[1].lstrip() == "Yes":
             return True
         else:
             return False
 
 
     def set_flow_control(self, enable):
         """
         Changes the pause parameters of the specified Ethernet device.
 
         @param enable: true -> enable pause frames, false -> disable pause frames
 
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.set_flow_control(True)
         """
         if enable not in ['on', 'off']:
             raise ValueError("Value out of range")
 
         if self.get_driver_name() in ['vmxnet3', 'virtio_net']:
             self._debug_msg('{} driver does not support changing flow control settings!'
                             .format(self.get_driver_name()))
             return
 
         # Assemble command executed on system. Unfortunately there is no way
         # to change this setting via sysfs
         cmd = '/sbin/ethtool --pause {0} autoneg {1} tx {1} rx {1}'.format(
               self._ifname, enable)
         try:
             # An exception will be thrown if the settings are not changed
             self._cmd(cmd)
         except CalledProcessError:
             pass
 
 
     def set_speed_duplex(self, speed, duplex):
         """
         Set link speed in Mbit/s and duplex.
 
         @speed can be any link speed in MBit/s, e.g. 10, 100, 1000 auto
         @duplex can be half, full, auto
 
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.set_speed_duplex('auto', 'auto')
         """
 
         if speed not in ['auto', '10', '100', '1000', '2500', '5000', '10000', '25000', '40000', '50000', '100000', '400000']:
             raise ValueError("Value out of range (speed)")
 
         if duplex not in ['auto', 'full', 'half']:
             raise ValueError("Value out of range (duplex)")
 
         if self.get_driver_name() in ['vmxnet3', 'virtio_net']:
             self._debug_msg('{} driver does not support changing speed/duplex settings!'
                             .format(self.get_driver_name()))
             return
 
 
         cmd = '/sbin/ethtool -s {}'.format(self._ifname)
         if speed == 'auto' or duplex == 'auto':
             cmd += ' autoneg on'
         else:
             cmd += ' speed {} duplex {} autoneg off'.format(speed, duplex)
 
         return self._cmd(cmd)
 
 
     def set_gro(self, state):
         """
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.set_gro('on')
         """
         if state not in ['on', 'off']:
             raise ValueError('state must be "on" or "off"')
 
         cmd = '/sbin/ethtool -K {} gro {}'.format(self._ifname, state)
         return self._cmd(cmd)
 
 
     def set_gso(self, state):
         """
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.set_gso('on')
         """
         if state not in ['on', 'off']:
             raise ValueError('state must be "on" or "off"')
 
         cmd = '/sbin/ethtool -K {} gso {}'.format(self._ifname, state)
         return self._cmd(cmd)
 
 
     def set_sg(self, state):
         """
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.set_sg('on')
         """
         if state not in ['on', 'off']:
             raise ValueError('state must be "on" or "off"')
 
         cmd = '/sbin/ethtool -K {} sg {}'.format(self._ifname, state)
         return self._cmd(cmd)
 
 
     def set_tso(self, state):
         """
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.set_tso('on')
         """
         if state not in ['on', 'off']:
             raise ValueError('state must be "on" or "off"')
 
         cmd = '/sbin/ethtool -K {} tso {}'.format(self._ifname, state)
         return self._cmd(cmd)
 
 
     def set_ufo(self, state):
         """
         Example:
         >>> from vyos.ifconfig import EthernetIf
         >>> i = EthernetIf('eth0')
         >>> i.set_udp_offload('on')
         """
         if state not in ['on', 'off']:
             raise ValueError('state must be "on" or "off"')
 
         cmd = '/sbin/ethtool -K {} ufo {}'.format(self._ifname, state)
         return self._cmd(cmd)
 
 
 class BondIf(VLANIf):
     """
     The Linux bonding driver provides a method for aggregating multiple network
     interfaces into a single logical "bonded" interface. The behavior of the
     bonded interfaces depends upon the mode; generally speaking, modes provide
     either hot standby or load balancing services. Additionally, link integrity
     monitoring may be performed.
     """
     def __init__(self, ifname):
         super().__init__(ifname, type='bond')
 
     def remove(self):
         """
         Remove interface from operating system. Removing the interface
         deconfigures all assigned IP addresses and clear possible DHCP(v6)
         client processes.
         Example:
         >>> from vyos.ifconfig import Interface
         >>> i = Interface('eth0')
         >>> i.remove()
         """
         # when a bond member gets deleted, all members are placed in A/D state
         # even when they are enabled inside CLI. This will make the config
         # and system look async.
         slave_list = []
         for s in self.get_slaves():
             slave = {
                 'ifname' : s,
                 'state': Interface(s).state
             }
             slave_list.append(slave)
 
         # remove bond master which places members in disabled state
         super().remove()
 
         # replicate previous interface state before bond destruction back to
         # physical interface
         for slave in slave_list:
              i = Interface(slave['ifname'])
              i.state = slave['state']
 
     @property
     def xmit_hash_policy(self):
         """
         Selects the transmit hash policy to use for slave selection in
         balance-xor, 802.3ad, and tlb modes. Possible values are: layer2,
         layer2+3, layer3+4, encap2+3, encap3+4.
 
         The default value is layer2
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').xmit_hash_policy
         'layer3+4'
         """
         # Linux Kernel appends has policy value to string, e.g. 'layer3+4 1',
         # so remove the later part and only return the mode as string.
         return self._read_sysfs('/sys/class/net/{}/bonding/xmit_hash_policy'
                                 .format(self._ifname)).split()[0]
 
     @xmit_hash_policy.setter
     def xmit_hash_policy(self, mode):
         """
         Selects the transmit hash policy to use for slave selection in
         balance-xor, 802.3ad, and tlb modes. Possible values are: layer2,
         layer2+3, layer3+4, encap2+3, encap3+4.
 
         The default value is layer2
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').xmit_hash_policy = 'layer2+3'
         >>> BondIf('bond0').proxy_arp
         '1'
         """
         if not mode in ['layer2', 'layer2+3', 'layer3+4', 'encap2+3', 'encap3+4']:
             raise ValueError("Value out of range")
         return self._write_sysfs('/sys/class/net/{}/bonding/xmit_hash_policy'
                                  .format(self._ifname), mode)
 
     @property
     def arp_interval(self):
         """
         Specifies the ARP link monitoring frequency in milliseconds.
 
         The ARP monitor works by periodically checking the slave devices to
         determine whether they have sent or received traffic recently (the
         precise criteria depends upon the bonding mode, and the state of the
         slave). Regular traffic is generated via ARP probes issued for the
         addresses specified by the arp_ip_target option.
 
         The default value is 0.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').arp_interval
         '0'
         """
         return self._read_sysfs('/sys/class/net/{}/bonding/arp_interval'
                                 .format(self._ifname))
 
     @arp_interval.setter
     def arp_interval(self, time):
         """
         Specifies the IP addresses to use as ARP monitoring peers when
         arp_interval is > 0. These are the targets of the ARP request sent to
         determine the health of the link to the targets. Specify these values
         in ddd.ddd.ddd.ddd format. Multiple IP addresses must be separated by
         a comma. At least one IP address must be given for ARP monitoring to
         function. The maximum number of targets that can be specified is 16.
 
         The default value is no IP addresses.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').arp_interval = '100'
         >>> BondIf('bond0').arp_interval
         '100'
         """
         return self._write_sysfs('/sys/class/net/{}/bonding/arp_interval'
                                  .format(self._ifname), time)
 
     @property
     def arp_ip_target(self):
         """
         Specifies the IP addresses to use as ARP monitoring peers when
         arp_interval is > 0. These are the targets of the ARP request sent to
         determine the health of the link to the targets. Specify these values
         in ddd.ddd.ddd.ddd format. Multiple IP addresses must be separated by
         a comma. At least one IP address must be given for ARP monitoring to
         function. The maximum number of targets that can be specified is 16.
 
         The default value is no IP addresses.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').arp_ip_target
         '192.0.2.1'
         """
         return self._read_sysfs('/sys/class/net/{}/bonding/arp_ip_target'
                                 .format(self._ifname))
 
     @arp_ip_target.setter
     def arp_ip_target(self, target):
         """
         Specifies the IP addresses to use as ARP monitoring peers when
         arp_interval is > 0. These are the targets of the ARP request sent to
         determine the health of the link to the targets. Specify these values
         in ddd.ddd.ddd.ddd format. Multiple IP addresses must be separated by
         a comma. At least one IP address must be given for ARP monitoring to
         function. The maximum number of targets that can be specified is 16.
 
         The default value is no IP addresses.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').arp_ip_target = '192.0.2.1'
         >>> BondIf('bond0').arp_ip_target
         '192.0.2.1'
         """
         return self._write_sysfs('/sys/class/net/{}/bonding/arp_ip_target'
                                  .format(self._ifname), target)
 
     @property
     def miimon(self):
         """
         Specifies the MII link monitoring frequency in milliseconds.
         This determines how often the link state of each slave is
         inspected for link failures. A value of zero disables MII
         link monitoring. A value of 100 is a good starting point.
 
         The default value is 0.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').miimon
         '250'
         """
         return self._read_sysfs('/sys/class/net/{}/bonding/miimon'
                                 .format(self._ifname))
 
 
     @miimon.setter
     def miimon(self, time):
         """
         Specifies the MII link monitoring frequency in milliseconds.
         This determines how often the link state of each slave is
         inspected for link failures. A value of zero disables MII
         link monitoring. A value of 100 is a good starting point.
 
         The default value is 0.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').miimon = 250
         >>> BondIf('bond0').miimon
         '250'
         """
         return self._write_sysfs('/sys/class/net/{}/bonding/miimon'
                                  .format(self._ifname), time)
 
 
     def add_port(self, interface):
         """
         Enslave physical interface to bond.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').add_port('eth0')
         >>> BondIf('bond0').add_port('eth1')
         """
         # An interface can only be added to a bond if it is in 'down' state. If
         # interface is in 'up' state, the following Kernel error will  be thrown:
         # bond0: eth1 is up - this may be due to an out of date ifenslave.
         Interface(interface).state = 'down'
 
         return self._write_sysfs('/sys/class/net/{}/bonding/slaves'
                                  .format(self._ifname), '+' + interface)
 
     def del_port(self, interface):
         """
         Remove physical port from bond
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').del_port('eth1')
         """
         return self._write_sysfs('/sys/class/net/{}/bonding/slaves'
                                  .format(self._ifname), '-' + interface)
 
     def get_slaves(self):
         """
         Return a list with all configured slave interfaces on this bond.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').get_slaves()
         ['eth1', 'eth2']
         """
         slaves = self._read_sysfs('/sys/class/net/{}/bonding/slaves'
                                   .format(self._ifname))
         return list(map(str, slaves.split()))
 
 
     def set_primary(self, interface):
         """
         A string (eth0, eth2, etc) specifying which slave is the primary
         device. The specified device will always be the active slave while it
         is available. Only when the primary is off-line will alternate devices
         be used. This is useful when one slave is preferred over another, e.g.,
         when one slave has higher throughput than another.
 
         The primary option is only valid for active-backup, balance-tlb and
         balance-alb mode.
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').set_primary('eth2')
         """
         if not interface:
             # reset primary interface
             interface = '\0'
 
         return self._write_sysfs('/sys/class/net/{}/bonding/primary'
                                  .format(self._ifname), interface)
 
     @property
     def mode(self):
         """
         Specifies one of the bonding policies. The default is balance-rr
         (round robin).
 
         Possible values are: balance-rr (0), active-backup (1), balance-xor (2),
         broadcast (3), 802.3ad (4), balance-tlb (5), balance-alb (6)
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').mode
         'balance-rr'
         """
         return self._read_sysfs('/sys/class/net/{}/bonding/mode'
                                 .format(self._ifname)).split()[0]
 
     @mode.setter
     def mode(self, mode):
         """
         Specifies one of the bonding policies. The default is balance-rr
         (round robin).
 
         Possible values are: balance-rr, active-backup, balance-xor,
         broadcast, 802.3ad, balance-tlb, balance-alb
 
         NOTE: the bonding mode can not be changed when the bond itself has
         slaves
 
         Example:
         >>> from vyos.ifconfig import BondIf
         >>> BondIf('bond0').mode = '802.3ad'
         >>> BondIf('bond0').mode
         '802.3ad'
         """
         if not mode in [
             'balance-rr', 'active-backup', 'balance-xor', 'broadcast',
                         '802.3ad', 'balance-tlb', 'balance-alb']:
             raise ValueError("Value out of range")
 
         return self._write_sysfs('/sys/class/net/{}/bonding/mode'
                                  .format(self._ifname), mode)
 
 
 class WireGuardIf(Interface):
     """
     Wireguard interface class, contains a comnfig dictionary since
     wireguard VPN is being comnfigured via the wg command rather than
     writing the config into a file. Otherwise if a pre-shared key is used
     (symetric enryption key), it would we exposed within multiple files.
     Currently it's only within the config.boot if the config was saved.
 
     Example:
     >>> from vyos.ifconfig import WireGuardIf as wg_if
     >>> wg_intfc = wg_if("wg01")
     >>> print (wg_intfc.wg_config)
     {'private-key': None, 'keepalive': 0, 'endpoint': None, 'port': 0,
     'allowed-ips': [], 'pubkey': None, 'fwmark': 0, 'psk': '/dev/null'}
     >>> wg_intfc.wg_config['keepalive'] = 100
     >>> print (wg_intfc.wg_config)
     {'private-key': None, 'keepalive': 100, 'endpoint': None, 'port': 0,
     'allowed-ips': [], 'pubkey': None, 'fwmark': 0, 'psk': '/dev/null'}
     """
 
     def __init__(self, ifname):
         super().__init__(ifname, type='wireguard')
         self.config = {
             'port': 0,
           'private-key': None,
           'pubkey': None,
           'psk': '/dev/null',
           'allowed-ips': [],
           'fwmark': 0x00,
           'endpoint': None,
           'keepalive': 0
         }
 
     def update(self):
         if not self.config['private-key']:
             raise ValueError("private key required")
         else:
             # fmask permission check?
             pass
 
         cmd = "wg set {} ".format(self._ifname)
         cmd += "listen-port {} ".format(self.config['port'])
         cmd += "fwmark {} ".format(str(self.config['fwmark']))
         cmd += "private-key {} ".format(self.config['private-key'])
         cmd += "peer {} ".format(self.config['pubkey'])
         cmd += " preshared-key {} ".format(self.config['psk'])
         cmd += " allowed-ips "
         for aip in self.config['allowed-ips']:
             if aip != self.config['allowed-ips'][-1]:
                 cmd += aip + ","
             else:
                 cmd += aip
         if self.config['endpoint']:
             cmd += " endpoint {}".format(self.config['endpoint'])
         cmd += " persistent-keepalive {}".format(self.config['keepalive'])
 
         self._cmd(cmd)
 
         # remove psk since it isn't required anymore and is saved in the cli
         # config only !!
         if self.config['psk'] != '/dev/null':
             if os.path.exists(self.config['psk']):
                 os.remove(self.config['psk'])
 
 
     def remove_peer(self, peerkey):
         """
         Remove a peer of an interface, peers are identified by their public key.
         Giving it a readable name is a vyos feature, to remove a peer the pubkey
         and the interface is needed, to remove the entry.
         """
         cmd = "wg set {0} peer {1} remove".format(
             self._ifname, str(peerkey))
         self._cmd(cmd)
 
 
 class VXLANIf(Interface, ):
     """
     The VXLAN protocol is a tunnelling protocol designed to solve the
     problem of limited VLAN IDs (4096) in IEEE 802.1q.  With VXLAN the
     size of the identifier is expanded to 24 bits (16777216).
 
     VXLAN is described by IETF RFC 7348, and has been implemented by a
     number of vendors.  The protocol runs over UDP using a single
     destination port.  This document describes the Linux kernel tunnel
     device, there is also a separate implementation of VXLAN for
     Openvswitch.
 
     Unlike most tunnels, a VXLAN is a 1 to N network, not just point to
     point. A VXLAN device can learn the IP address of the other endpoint
     either dynamically in a manner similar to a learning bridge, or make
     use of statically-configured forwarding entries.
 
     For more information please refer to:
     https://www.kernel.org/doc/Documentation/networking/vxlan.txt
     """
     def __init__(self, ifname, config=''):
         if config:
             self._ifname = ifname
 
             if not os.path.exists('/sys/class/net/{}'.format(self._ifname)):
                 # we assume that by default a multicast interface is created
                 group = 'group {}'.format(config['group'])
 
                 # if remote host is specified we ignore the multicast address
                 if config['remote']:
                     group = 'remote {}'.format(config['remote'])
 
                 # an underlay device is not always specified
                 dev = ''
                 if config['dev']:
                     dev = 'dev {}'.format(config['dev'])
 
                 cmd = 'ip link add {intf} type vxlan id {vni} {grp_rem} {dev} dstport {port}' \
                        .format(intf=self._ifname, vni=config['vni'], grp_rem=group, dev=dev, port=config['port'])
                 self._cmd(cmd)
 
         super().__init__(ifname, type='vxlan')
 
     @staticmethod
     def get_config():
         """
         VXLAN interfaces require a configuration when they are added using
         iproute2. This static method will provide the configuration dictionary
         used by this class.
 
         Example:
         >> dict = VXLANIf().get_config()
         """
         config = {
             'vni': 0,
             'dev': '',
             'group': '',
             'port': 8472, # The Linux implementation of VXLAN pre-dates
                           # the IANA's selection of a standard destination port
             'remote': ''
         }
         return config
diff --git a/src/conf_mode/interface-bonding.py b/src/conf_mode/interface-bonding.py
index 83cd2facc..dce4a8106 100755
--- a/src/conf_mode/interface-bonding.py
+++ b/src/conf_mode/interface-bonding.py
@@ -1,459 +1,459 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2019 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 
 from copy import deepcopy
 from sys import exit
 from netifaces import interfaces
 
 from vyos.ifconfig import BondIf, VLANIf
 from vyos.configdict import list_diff, vlan_to_dict
 from vyos.config import Config
 from vyos import ConfigError
 
 default_config_data = {
     'address': [],
     'address_remove': [],
     'arp_mon_intvl': 0,
     'arp_mon_tgt': [],
     'description': '',
     'deleted': False,
     'dhcp_client_id': '',
     'dhcp_hostname': '',
     'dhcpv6_prm_only': False,
     'dhcpv6_temporary': False,
     'disable': False,
     'disable_link_detect': 1,
     'hash_policy': 'layer2',
     'ip_arp_cache_tmo': 30,
     'ip_proxy_arp': 0,
     'ip_proxy_arp_pvlan': 0,
     'intf': '',
     'mac': '',
     'mode': '802.3ad',
     'member': [],
     'mtu': 1500,
     'primary': '',
     'vif_s': [],
     'vif_s_remove': [],
     'vif': [],
     'vif_remove': []
 }
 
 
 def get_bond_mode(mode):
     if mode == 'round-robin':
         return 'balance-rr'
     elif mode == 'active-backup':
         return 'active-backup'
     elif mode == 'xor-hash':
         return 'balance-xor'
     elif mode == 'broadcast':
         return 'broadcast'
     elif mode == '802.3ad':
         return '802.3ad'
     elif mode == 'transmit-load-balance':
         return 'balance-tlb'
     elif mode == 'adaptive-load-balance':
         return 'balance-alb'
     else:
         raise ConfigError('invalid bond mode "{}"'.format(mode))
 
 
 def apply_vlan_config(vlan, config):
     """
     Generic function to apply a VLAN configuration from a dictionary
     to a VLAN interface
     """
 
     if type(vlan) != type(VLANIf("lo")):
         raise TypeError()
 
     # update interface description used e.g. within SNMP
     vlan.ifalias = config['description']
     # ignore link state changes
-    vlan.link_detect = config['disable_link_detect']
+    vlan.set_link_detect(config['disable_link_detect'])
     # Maximum Transmission Unit (MTU)
     vlan.set_mtu(config['mtu'])
     # Change VLAN interface MAC address
     if config['mac']:
         vlan.set_mac(config['mac'])
 
     # enable/disable VLAN interface
     if config['disable']:
         vlan.state = 'down'
     else:
         vlan.state = 'up'
 
     # Configure interface address(es)
     # - not longer required addresses get removed first
     # - newly addresses will be added second
     for addr in config['address_remove']:
         vlan.del_addr(addr)
     for addr in config['address']:
         vlan.add_addr(addr)
 
 
 def get_config():
     # initialize kernel module if not loaded
     if not os.path.isfile('/sys/class/net/bonding_masters'):
         import syslog
         syslog.syslog(syslog.LOG_NOTICE, "loading bonding kernel module")
         if os.system('modprobe bonding max_bonds=0 miimon=250') != 0:
             syslog.syslog(syslog.LOG_NOTICE, "failed loading bonding kernel module")
             raise ConfigError("failed loading bonding kernel module")
 
     bond = deepcopy(default_config_data)
     conf = Config()
 
     # determine tagNode instance
     try:
         bond['intf'] = os.environ['VYOS_TAGNODE_VALUE']
     except KeyError as E:
         print("Interface not specified")
 
     # check if bond has been removed
     cfg_base = 'interfaces bonding ' + bond['intf']
     if not conf.exists(cfg_base):
         bond['deleted'] = True
         return bond
 
     # set new configuration level
     conf.set_level(cfg_base)
 
     # retrieve configured interface addresses
     if conf.exists('address'):
         bond['address'] = conf.return_values('address')
 
     # get interface addresses (currently effective) - to determine which
     # address is no longer valid and needs to be removed
     eff_addr = conf.return_effective_values('address')
     bond['address_remove'] = list_diff(eff_addr, bond['address'])
 
     # ARP link monitoring frequency in milliseconds
     if conf.exists('arp-monitor interval'):
         bond['arp_mon_intvl'] = int(conf.return_value('arp-monitor interval'))
 
     # IP address to use for ARP monitoring
     if conf.exists('arp-monitor target'):
         bond['arp_mon_tgt'] = conf.return_values('arp-monitor target')
 
     # retrieve interface description
     if conf.exists('description'):
         bond['description'] = conf.return_value('description')
 
     # get DHCP client identifier
     if conf.exists('dhcp-options client-id'):
         bond['dhcp_client_id'] = conf.return_value('dhcp-options client-id')
 
     # DHCP client host name (overrides the system host name)
     if conf.exists('dhcp-options host-name'):
         bond['dhcp_hostname'] = conf.return_value('dhcp-options host-name')
 
     # DHCPv6 only acquire config parameters, no address
     if conf.exists('dhcpv6-options parameters-only'):
         bond['dhcpv6_prm_only'] = conf.return_value('dhcpv6-options parameters-only')
 
     # DHCPv6 temporary IPv6 address
     if conf.exists('dhcpv6-options temporary'):
         bond['dhcpv6_temporary'] = conf.return_value('dhcpv6-options temporary')
 
     # ignore link state changes
     if conf.exists('disable-link-detect'):
         bond['disable_link_detect'] = 2
 
     # disable bond interface
     if conf.exists('disable'):
         bond['disable'] = True
 
     # Bonding transmit hash policy
     if conf.exists('hash-policy'):
         bond['hash_policy'] = conf.return_value('hash-policy')
 
     # ARP cache entry timeout in seconds
     if conf.exists('ip arp-cache-timeout'):
         bond['ip_arp_cache_tmo'] = int(conf.return_value('ip arp-cache-timeout'))
 
     # Enable proxy-arp on this interface
     if conf.exists('ip enable-proxy-arp'):
         bond['ip_proxy_arp'] = 1
 
     # Enable private VLAN proxy ARP on this interface
     if conf.exists('ip proxy-arp-pvlan'):
         bond['ip_proxy_arp_pvlan'] = 1
 
     # Media Access Control (MAC) address
     if conf.exists('mac'):
         bond['mac'] = conf.return_value('mac')
 
     # Bonding mode
     if conf.exists('mode'):
         bond['mode'] = get_bond_mode(conf.return_value('mode'))
 
     # Maximum Transmission Unit (MTU)
     if conf.exists('mtu'):
         bond['mtu'] = int(conf.return_value('mtu'))
 
     # determine bond member interfaces (currently configured)
     if conf.exists('member interface'):
         bond['member'] = conf.return_values('member interface')
 
     # Primary device interface
     if conf.exists('primary'):
         bond['primary'] = conf.return_value('primary')
 
     # re-set configuration level and retrieve vif-s interfaces
     conf.set_level(cfg_base)
     # get vif-s interfaces (currently effective) - to determine which vif-s
     # interface is no longer present and needs to be removed
     eff_intf = conf.list_effective_nodes('vif-s')
     act_intf = conf.list_nodes('vif-s')
     bond['vif_s_remove'] = list_diff(eff_intf, act_intf)
 
     if conf.exists('vif-s'):
         for vif_s in conf.list_nodes('vif-s'):
             # set config level to vif-s interface
             conf.set_level(cfg_base + ' vif-s ' + vif_s)
             bond['vif_s'].append(vlan_to_dict(conf))
 
     # re-set configuration level and retrieve vif-s interfaces
     conf.set_level(cfg_base)
     # Determine vif interfaces (currently effective) - to determine which
     # vif interface is no longer present and needs to be removed
     eff_intf = conf.list_effective_nodes('vif')
     act_intf = conf.list_nodes('vif')
     bond['vif_remove'] = list_diff(eff_intf, act_intf)
 
     if conf.exists('vif'):
         for vif in conf.list_nodes('vif'):
             # set config level to vif interface
             conf.set_level(cfg_base + ' vif ' + vif)
             bond['vif'].append(vlan_to_dict(conf))
 
     return bond
 
 
 def verify(bond):
     if len (bond['arp_mon_tgt']) > 16:
         raise ConfigError('The maximum number of targets that can be specified is 16')
 
     if bond['primary']:
         if bond['mode'] not in ['active-backup', 'balance-tlb', 'balance-alb']:
             raise ConfigError('Mode dependency failed, primary not supported ' \
                               'in this mode.'.format())
 
         if bond['primary'] not in bond['member']:
             raise ConfigError('Interface "{}" is not part of the bond' \
                               .format(bond['primary']))
 
     for vif_s in bond['vif_s']:
         for vif in bond['vif']:
             if vif['id'] == vif_s['id']:
                 raise ConfigError('Can not use identical ID on vif and vif-s interface')
 
 
     conf = Config()
     for intf in bond['member']:
         # a bonding member interface is only allowed to be assigned to one bond!
         all_bonds = conf.list_nodes('interfaces bonding')
         # We do not need to check our own bond
         all_bonds.remove(bond['intf'])
         for tmp in all_bonds:
             if conf.exists('interfaces bonding ' + tmp + ' member interface ' + intf):
                 raise ConfigError('can not enslave interface {} which already ' \
                                   'belongs to {}'.format(intf, tmp))
 
         # can not add interfaces with an assigned address to a bond
         if conf.exists('interfaces ethernet ' + intf + ' address'):
             raise ConfigError('can not enslave interface {} which has an address ' \
                               'assigned'.format(intf))
 
         # bond members are not allowed to be bridge members, too
         for tmp in conf.list_nodes('interfaces bridge'):
             if conf.exists('interfaces bridge ' + tmp + ' member interface ' + intf):
                 raise ConfigError('can not enslave interface {} which belongs to ' \
                                   'bridge {}'.format(intf, tmp))
 
         # bond members are not allowed to be vrrp members, too
         for tmp in conf.list_nodes('high-availability vrrp group'):
             if conf.exists('high-availability vrrp group ' + tmp + ' interface ' + intf):
                 raise ConfigError('can not enslave interface {} which belongs to ' \
                                   'VRRP group {}'.format(intf, tmp))
 
         # bond members are not allowed to be underlaying psuedo-ethernet devices
         for tmp in conf.list_nodes('interfaces pseudo-ethernet'):
             if conf.exists('interfaces pseudo-ethernet ' + tmp + ' link ' + intf):
                 raise ConfigError('can not enslave interface {} which belongs to ' \
                                   'pseudo-ethernet {}'.format(intf, tmp))
 
         # bond members are not allowed to be underlaying vxlan devices
         for tmp in conf.list_nodes('interfaces vxlan'):
             if conf.exists('interfaces vxlan ' + tmp + ' link ' + intf):
                 raise ConfigError('can not enslave interface {} which belongs to ' \
                                   'vxlan {}'.format(intf, tmp))
 
 
     if bond['primary']:
         if bond['primary'] not in bond['member']:
             raise ConfigError('primary interface must be a member interface of {}' \
                               .format(bond['intf']))
 
         if bond['mode'] not in ['active-backup', 'balance-tlb', 'balance-alb']:
             raise ConfigError('primary interface only works for mode active-backup, ' \
                               'transmit-load-balance or adaptive-load-balance')
 
     if bond['arp_mon_intvl'] > 0:
         if bond['mode'] in ['802.3ad', 'balance-tlb', 'balance-alb']:
             raise ConfigError('ARP link monitoring does not work for mode 802.3ad, ' \
                               'transmit-load-balance or adaptive-load-balance')
 
     return None
 
 
 def generate(bond):
     return None
 
 
 def apply(bond):
     b = BondIf(bond['intf'])
 
     if bond['deleted']:
         # delete interface
         b.remove()
     else:
         # Some parameters can not be changed when the bond is up.
         # Always disable the bond prior changing anything
         b.state = 'down'
 
         # The bonding mode can not be changed when there are interfaces enslaved
         # to this bond, thus we will free all interfaces from the bond first!
         for intf in b.get_slaves():
             b.del_port(intf)
 
         # ARP link monitoring frequency, reset miimon when arp-montior is inactive
         if bond['arp_mon_intvl'] == 0:
             # reset miimon to default
             b.miimon = 250
         else:
             b.arp_interval = bond['arp_mon_intvl']
 
         # ARP monitor targets need to be synchronized between sysfs and CLI.
         # Unfortunately an address can't be send twice to sysfs as this will
         # result in the following exception:  OSError: [Errno 22] Invalid argument.
         #
         # We remove ALL adresses prior adding new ones, this will remove addresses
         # added manually by the user too - but as we are limited to 16 adresses
         # from the kernel side this looks valid to me. We won't run into an error
         # when a user added manual adresses which would result in having more
         # then 16 adresses in total.
         arp_tgt_addr = list(map(str, b.arp_ip_target.split()))
         for addr in arp_tgt_addr:
             b.arp_ip_target = '-' + addr
 
         # Add configured ARP target addresses
         for addr in bond['arp_mon_tgt']:
             b.arp_ip_target = '+' + addr
 
         # update interface description used e.g. within SNMP
         b.ifalias = bond['description']
 
         #
         # missing DHCP/DHCPv6 options go here
         #
 
         # ignore link state changes
-        b.link_detect = bond['disable_link_detect']
+        b.set_link_detect(bond['disable_link_detect'])
         # Bonding transmit hash policy
         b.xmit_hash_policy = bond['hash_policy']
         # configure ARP cache timeout in milliseconds
         b.arp_cache_tmp = bond['ip_arp_cache_tmo']
         # Enable proxy-arp on this interface
         b.proxy_arp = bond['ip_proxy_arp']
         # Enable private VLAN proxy ARP on this interface
         b.proxy_arp_pvlan = bond['ip_proxy_arp_pvlan']
 
         # Change interface MAC address
         if bond['mac']:
             b.set_mac(bond['mac'])
 
         # Bonding policy
         b.mode = bond['mode']
         # Maximum Transmission Unit (MTU)
         b.set_mtu(bond['mtu'])
 
         # Primary device interface
         if bond['primary']:
             b.set_primary(bond['primary'])
 
         # Add (enslave) interfaces to bond
         for intf in bond['member']:
             b.add_port(intf)
 
         # As the bond interface is always disabled first when changing
         # parameters we will only re-enable the interface if it is not
         # administratively disabled
         if not bond['disable']:
             b.state = 'up'
 
         # Configure interface address(es)
         # - not longer required addresses get removed first
         # - newly addresses will be added second
         for addr in bond['address_remove']:
             b.del_addr(addr)
         for addr in bond['address']:
             b.add_addr(addr)
 
         # remove no longer required service VLAN interfaces (vif-s)
         for vif_s in bond['vif_s_remove']:
             b.del_vlan(vif_s)
 
         # create service VLAN interfaces (vif-s)
         for vif_s in bond['vif_s']:
             s_vlan = b.add_vlan(vif_s['id'], ethertype=vif_s['ethertype'])
             apply_vlan_config(s_vlan, vif_s)
 
             # remove no longer required client VLAN interfaces (vif-c)
             # on lower service VLAN interface
             for vif_c in vif_s['vif_c_remove']:
                 s_vlan.del_vlan(vif_c)
 
             # create client VLAN interfaces (vif-c)
             # on lower service VLAN interface
             for vif_c in vif_s['vif_c']:
                 c_vlan = s_vlan.add_vlan(vif_c['id'])
                 apply_vlan_config(c_vlan, vif_c)
 
         # remove no longer required VLAN interfaces (vif)
         for vif in bond['vif_remove']:
             b.del_vlan(vif)
 
         # create VLAN interfaces (vif)
         for vif in bond['vif']:
             vlan = b.add_vlan(vif['id'])
             apply_vlan_config(vlan, vif)
 
     return None
 
 if __name__ == '__main__':
     try:
         c = get_config()
         verify(c)
         generate(c)
         apply(c)
     except ConfigError as e:
         print(e)
         exit(1)
diff --git a/src/conf_mode/interface-bridge.py b/src/conf_mode/interface-bridge.py
index ef8680c5f..558ec3cc6 100755
--- a/src/conf_mode/interface-bridge.py
+++ b/src/conf_mode/interface-bridge.py
@@ -1,253 +1,253 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2019 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 
 from copy import deepcopy
 from sys import exit
 from netifaces import interfaces
 
 from vyos.ifconfig import BridgeIf, Interface
 from vyos.configdict import list_diff
 from vyos.config import Config
 from vyos import ConfigError
 
 default_config_data = {
     'address': [],
     'address_remove': [],
     'aging': 300,
     'arp_cache_tmo': 30,
     'description': '',
     'deleted': False,
     'disable': False,
     'disable_link_detect': 1,
     'forwarding_delay': 14,
     'hello_time': 2,
     'igmp_querier': 0,
     'intf': '',
     'mac' : '',
     'max_age': 20,
     'member': [],
     'member_remove': [],
     'priority': 32768,
     'stp': 0
 }
 
 def get_config():
     bridge = deepcopy(default_config_data)
     conf = Config()
 
     # determine tagNode instance
     try:
         bridge['intf'] = os.environ['VYOS_TAGNODE_VALUE']
     except KeyError as E:
         print("Interface not specified")
 
     # Check if bridge has been removed
     if not conf.exists('interfaces bridge ' + bridge['intf']):
         bridge['deleted'] = True
         return bridge
 
     # set new configuration level
     conf.set_level('interfaces bridge ' + bridge['intf'])
 
     # retrieve configured interface addresses
     if conf.exists('address'):
         bridge['address'] = conf.return_values('address')
 
     # Determine interface addresses (currently effective) - to determine which
     # address is no longer valid and needs to be removed
     eff_addr = conf.return_effective_values('address')
     bridge['address_remove'] = list_diff(eff_addr, bridge['address'])
 
     # retrieve aging - how long addresses are retained
     if conf.exists('aging'):
         bridge['aging'] = int(conf.return_value('aging'))
 
     # retrieve interface description
     if conf.exists('description'):
         bridge['description'] = conf.return_value('description')
 
     # Disable this bridge interface
     if conf.exists('disable'):
         bridge['disable'] = True
 
     # Ignore link state changes
     if conf.exists('disable-link-detect'):
         bridge['disable_link_detect'] = 2
 
     # Forwarding delay
     if conf.exists('forwarding-delay'):
         bridge['forwarding_delay'] = int(conf.return_value('forwarding-delay'))
 
     # Hello packet advertisment interval
     if conf.exists('hello-time'):
         bridge['hello_time'] = int(conf.return_value('hello-time'))
 
     # Enable Internet Group Management Protocol (IGMP) querier
     if conf.exists('igmp querier'):
         bridge['igmp_querier'] = 1
 
     # ARP cache entry timeout in seconds
     if conf.exists('ip arp-cache-timeout'):
         bridge['arp_cache_tmo'] = int(conf.return_value('ip arp-cache-timeout'))
 
     # Media Access Control (MAC) address
     if conf.exists('mac'):
         bridge['mac'] = conf.return_value('mac')
 
     # Interval at which neighbor bridges are removed
     if conf.exists('max-age'):
         bridge['max_age'] = int(conf.return_value('max-age'))
 
     # Determine bridge member interface (currently configured)
     for intf in conf.list_nodes('member interface'):
         # cost and priority initialized with linux defaults
         # by reading /sys/devices/virtual/net/br0/brif/eth2/{path_cost,priority}
         # after adding interface to bridge after reboot
         iface = {
             'name': intf,
             'cost': 100,
             'priority': 32
         }
 
         if conf.exists('member interface {} cost'.format(intf)):
             iface['cost'] = int(conf.return_value('member interface {} cost'.format(intf)))
 
         if conf.exists('member interface {} priority'.format(intf)):
             iface['priority'] = int(conf.return_value('member interface {} priority'.format(intf)))
 
         bridge['member'].append(iface)
 
     # Determine bridge member interface (currently effective) - to determine which
     # interfaces is no longer assigend to the bridge and thus can be removed
     eff_intf = conf.list_effective_nodes('member interface')
     act_intf = conf.list_nodes('member interface')
     bridge['member_remove'] = list_diff(eff_intf, act_intf)
 
     # Priority for this bridge
     if conf.exists('priority'):
         bridge['priority'] = int(conf.return_value('priority'))
 
     # Enable spanning tree protocol
     if conf.exists('stp'):
         bridge['stp'] = 1
 
     return bridge
 
 def verify(bridge):
     conf = Config()
     for br in conf.list_nodes('interfaces bridge'):
         # it makes no sense to verify ourself in this case
         if br == bridge['intf']:
             continue
 
         for intf in bridge['member']:
             tmp = conf.list_nodes('interfaces bridge {} member interface'.format(br))
             if intf['name'] in tmp:
                 raise ConfigError('Interface "{}" belongs to bridge "{}" and can not be enslaved.'.format(intf['name'], bridge['intf']))
 
     # the interface must exist prior adding it to a bridge
     for intf in bridge['member']:
         if intf['name'] not in interfaces():
             raise ConfigError('Can not add non existing interface "{}" to bridge "{}"'.format(intf['name'], bridge['intf']))
 
     # bridge members are not allowed to be bond members, too
     for intf in bridge['member']:
         for bond in conf.list_nodes('interfaces bonding'):
             if conf.exists('interfaces bonding ' + bond + ' member interface'):
                 if intf['name'] in conf.return_values('interfaces bonding ' + bond + ' member interface'):
                     raise ConfigError('Interface {} belongs to bond {}, can not add it to {}'.format(intf['name'], bond, bridge['intf']))
 
     return None
 
 def generate(bridge):
     return None
 
 def apply(bridge):
     br = BridgeIf(bridge['intf'])
 
     if bridge['deleted']:
         # delete interface
         br.remove()
     else:
         # enable interface
         br.state = 'up'
         # set ageing time
         br.set_ageing_time(bridge['aging'])
         # set bridge forward delay
         br.set_forward_delay(bridge['forwarding_delay'])
         # set hello time
         br.set_hello_time(bridge['hello_time'])
         # set max message age
         br.set_max_age(bridge['max_age'])
         # set bridge priority
         br.set_priority(bridge['priority'])
         # turn stp on/off
         br.set_stp(bridge['stp'])
         # enable or disable IGMP querier
         br.set_multicast_querier(bridge['igmp_querier'])
         # update interface description used e.g. within SNMP
         br.ifalias = bridge['description']
 
         # Change interface MAC address
         if bridge['mac']:
             br.set_mac(bridge['mac'])
 
         # remove interface from bridge
         for intf in bridge['member_remove']:
             br.del_port( intf['name'] )
 
         # add interfaces to bridge
         for member in bridge['member']:
             br.add_port(member['name'])
 
         # up/down interface
         if bridge['disable']:
             br.state = 'down'
 
         # Configure interface address(es)
         # - not longer required addresses get removed first
         # - newly addresses will be added second
         for addr in bridge['address_remove']:
             br.del_addr(addr)
         for addr in bridge['address']:
             br.add_addr(addr)
 
         # configure additional bridge member options
         for member in bridge['member']:
             # set bridge port path cost
             br.set_path_cost(member['name'], member['cost'])
             # set bridge port path priority
             br.set_path_priority(member['name'], member['priority'])
 
             i = Interface(member['name'])
             # configure ARP cache timeout
             i.arp_cache_tmo = bridge['arp_cache_tmo']
             # ignore link state changes
-            i.link_detect = bridge['disable_link_detect']
+            i.set_link_detect(bridge['disable_link_detect'])
 
     return None
 
 if __name__ == '__main__':
     try:
         c = get_config()
         verify(c)
         generate(c)
         apply(c)
     except ConfigError as e:
         print(e)
         exit(1)
diff --git a/src/conf_mode/interface-ethernet.py b/src/conf_mode/interface-ethernet.py
index 7708c0086..f4bc53a32 100755
--- a/src/conf_mode/interface-ethernet.py
+++ b/src/conf_mode/interface-ethernet.py
@@ -1,382 +1,382 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2019 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 
 from copy import deepcopy
 from sys import exit
 
 from vyos.ifconfig import EthernetIf, VLANIf
 from vyos.configdict import list_diff, vlan_to_dict
 from vyos.config import Config
 from vyos import ConfigError
 
 default_config_data = {
     'address': [],
     'address_remove': [],
     'description': '',
     'deleted': False,
     'dhcp_client_id': '',
     'dhcp_hostname': '',
     'dhcpv6_prm_only': False,
     'dhcpv6_temporary': False,
     'disable': False,
     'disable_link_detect': 1,
     'duplex': 'auto',
     'flow_control': 'on',
     'hw_id': '',
     'ip_arp_cache_tmo': 30,
     'ip_proxy_arp': 0,
     'ip_proxy_arp_pvlan': 0,
     'intf': '',
     'mac': '',
     'mtu': 1500,
     'offload_gro': 'off',
     'offload_gso': 'off',
     'offload_sg': 'off',
     'offload_tso': 'off',
     'offload_ufo': 'off',
     'speed': 'auto',
     'vif_s': [],
     'vif_s_remove': [],
     'vif': [],
     'vif_remove': []
 }
 
 
 def apply_vlan_config(vlan, config):
     """
     Generic function to apply a VLAN configuration from a dictionary
     to a VLAN interface
     """
 
     if type(vlan) != type(VLANIf("lo")):
         raise TypeError()
 
     # update interface description used e.g. within SNMP
     vlan.ifalias = config['description']
     # ignore link state changes
-    vlan.link_detect = config['disable_link_detect']
+    vlan.set_link_detect(config['disable_link_detect'])
     # Maximum Transmission Unit (MTU)
     vlan.set_mtu(config['mtu'])
     # Change VLAN interface MAC address
     if config['mac']:
         vlan.set_mac(config['mac'])
 
     # enable/disable VLAN interface
     if config['disable']:
         vlan.state = 'down'
     else:
         vlan.state = 'up'
 
     # Configure interface address(es)
     # - not longer required addresses get removed first
     # - newly addresses will be added second
     for addr in config['address_remove']:
         vlan.del_addr(addr)
     for addr in config['address']:
         vlan.add_addr(addr)
 
 
 def get_config():
     eth = deepcopy(default_config_data)
     conf = Config()
 
     # determine tagNode instance
     try:
         eth['intf'] = os.environ['VYOS_TAGNODE_VALUE']
     except KeyError as E:
         print("Interface not specified")
 
     # check if ethernet interface has been removed
     cfg_base = 'interfaces ethernet ' + eth['intf']
     if not conf.exists(cfg_base):
         eth['deleted'] = True
         # we can not bail out early as ethernet interface can not be removed
         # Kernel will complain with: RTNETLINK answers: Operation not supported.
         # Thus we need to remove individual settings
         return eth
 
     # set new configuration level
     conf.set_level(cfg_base)
 
     # retrieve configured interface addresses
     if conf.exists('address'):
         eth['address'] = conf.return_values('address')
 
     # get interface addresses (currently effective) - to determine which
     # address is no longer valid and needs to be removed
     eff_addr = conf.return_effective_values('address')
     eth['address_remove'] = list_diff(eff_addr, eth['address'])
 
     # retrieve interface description
     if conf.exists('description'):
         eth['description'] = conf.return_value('description')
 
     # get DHCP client identifier
     if conf.exists('dhcp-options client-id'):
         eth['dhcp_client_id'] = conf.return_value('dhcp-options client-id')
 
     # DHCP client host name (overrides the system host name)
     if conf.exists('dhcp-options host-name'):
         eth['dhcp_hostname'] = conf.return_value('dhcp-options host-name')
 
     # DHCPv6 only acquire config parameters, no address
     if conf.exists('dhcpv6-options parameters-only'):
         eth['dhcpv6_prm_only'] = conf.return_value('dhcpv6-options parameters-only')
 
     # DHCPv6 temporary IPv6 address
     if conf.exists('dhcpv6-options temporary'):
         eth['dhcpv6_temporary'] = conf.return_value('dhcpv6-options temporary')
 
     # ignore link state changes
     if conf.exists('disable-link-detect'):
         eth['disable_link_detect'] = 2
 
     # disable ethernet flow control (pause frames)
     if conf.exists('disable-flow-control'):
         eth['flow_control'] = 'off'
 
     # retrieve real hardware address
     if conf.exists('hw-id'):
         eth['hw_id'] = conf.return_value('hw-id')
 
     # disable interface
     if conf.exists('disable'):
         eth['disable'] = True
 
     # interface duplex
     if conf.exists('duplex'):
         eth['duplex'] = conf.return_value('duplex')
 
     # ARP cache entry timeout in seconds
     if conf.exists('ip arp-cache-timeout'):
         eth['ip_arp_cache_tmo'] = int(conf.return_value('ip arp-cache-timeout'))
 
     # Enable proxy-arp on this interface
     if conf.exists('ip enable-proxy-arp'):
         eth['ip_proxy_arp'] = 1
 
     # Enable private VLAN proxy ARP on this interface
     if conf.exists('ip proxy-arp-pvlan'):
         eth['ip_proxy_arp_pvlan'] = 1
 
     # Media Access Control (MAC) address
     if conf.exists('mac'):
         eth['mac'] = conf.return_value('mac')
 
     # Maximum Transmission Unit (MTU)
     if conf.exists('mtu'):
         eth['mtu'] = int(conf.return_value('mtu'))
 
     # GRO (generic receive offload)
     if conf.exists('offload-options generic-receive'):
         eth['offload_gro'] = conf.return_value('offload-options generic-receive')
 
     # GSO (generic segmentation offload)
     if conf.exists('offload-options generic-segmentation'):
         eth['offload_gso'] = conf.return_value('offload-options generic-segmentation')
 
     # scatter-gather option
     if conf.exists('offload-options scatter-gather'):
         eth['offload_sg'] = conf.return_value('offload-options scatter-gather')
 
     # TSO (TCP segmentation offloading)
     if conf.exists('offload-options tcp-segmentation'):
         eth['offload_tso'] = conf.return_value('offload-options tcp-segmentation')
 
     # UDP fragmentation offloading
     if conf.exists('offload-options udp-fragmentation'):
         eth['offload_ufo'] = conf.return_value('offload-options udp-fragmentation')
 
     # interface speed
     if conf.exists('speed'):
         eth['speed'] = conf.return_value('speed')
 
     # re-set configuration level and retrieve vif-s interfaces
     conf.set_level(cfg_base)
     # get vif-s interfaces (currently effective) - to determine which vif-s
     # interface is no longer present and needs to be removed
     eff_intf = conf.list_effective_nodes('vif-s')
     act_intf = conf.list_nodes('vif-s')
     eth['vif_s_remove'] = list_diff(eff_intf, act_intf)
 
     if conf.exists('vif-s'):
         for vif_s in conf.list_nodes('vif-s'):
             # set config level to vif-s interface
             conf.set_level(cfg_base + ' vif-s ' + vif_s)
             eth['vif_s'].append(vlan_to_dict(conf))
 
     # re-set configuration level and retrieve vif-s interfaces
     conf.set_level(cfg_base)
     # Determine vif interfaces (currently effective) - to determine which
     # vif interface is no longer present and needs to be removed
     eff_intf = conf.list_effective_nodes('vif')
     act_intf = conf.list_nodes('vif')
     eth['vif_remove'] = list_diff(eff_intf, act_intf)
 
     if conf.exists('vif'):
         for vif in conf.list_nodes('vif'):
             # set config level to vif interface
             conf.set_level(cfg_base + ' vif ' + vif)
             eth['vif'].append(vlan_to_dict(conf))
 
     return eth
 
 
 def verify(eth):
     if eth['deleted']:
         return None
 
     if eth['speed'] == 'auto':
         if eth['duplex'] != 'auto':
             raise ConfigError('If speed is hardcoded, duplex must be hardcoded, too')
 
     if eth['duplex'] == 'auto':
         if eth['speed'] != 'auto':
             raise ConfigError('If duplex is hardcoded, speed must be hardcoded, too')
 
     conf = Config()
     # some options can not be changed when interface is enslaved to a bond
     for bond in conf.list_nodes('interfaces bonding'):
         if conf.exists('interfaces bonding ' + bond + ' member interface'):
             bond_member = conf.return_values('interfaces bonding ' + bond + ' member interface')
             if eth['name'] in bond_member:
                 if eth['address']:
                     raise ConfigError('Can not assign address to interface {} which is a member of {}').format(eth['intf'], bond)
 
 
     return None
 
 def generate(eth):
     return None
 
 def apply(eth):
     e = EthernetIf(eth['intf'])
     if eth['deleted']:
         # delete interface
         e.remove()
     else:
         # update interface description used e.g. within SNMP
         e.ifalias = eth['description']
 
         #
         # missing DHCP/DHCPv6 options go here
         #
 
         # ignore link state changes
-        e.link_detect = eth['disable_link_detect']
+        e.set_link_detect(eth['disable_link_detect'])
         # disable ethernet flow control (pause frames)
         e.set_flow_control(eth['flow_control'])
         # configure ARP cache timeout in milliseconds
         e.arp_cache_tmo = eth['ip_arp_cache_tmo']
         # Enable proxy-arp on this interface
         e.proxy_arp = eth['ip_proxy_arp']
         # Enable private VLAN proxy ARP on this interface
         e.proxy_arp_pvlan = eth['ip_proxy_arp_pvlan']
 
         # Change interface MAC address - re-set to real hardware address (hw-id)
         # if custom mac is removed
         if eth['mac']:
             e.set_mac(eth['mac'])
         else:
             e.set_mac(eth['hw_id'])
 
         # Maximum Transmission Unit (MTU)
         e.set_mtu(eth['mtu'])
 
         # GRO (generic receive offload)
         e.set_gro(eth['offload_gro'])
 
         # GSO (generic segmentation offload)
         e.set_gso(eth['offload_gso'])
 
         # scatter-gather option
         e.set_sg(eth['offload_sg'])
 
         # TSO (TCP segmentation offloading)
         e.set_tso(eth['offload_tso'])
 
         # UDP fragmentation offloading
         e.set_ufo(eth['offload_ufo'])
 
         # Set physical interface speed and duplex
         e.set_speed_duplex(eth['speed'], eth['duplex'])
 
         # Enable/Disable interface
         if eth['disable']:
             e.state = 'down'
         else:
             e.state = 'up'
 
         # Configure interface address(es)
         # - not longer required addresses get removed first
         # - newly addresses will be added second
         for addr in eth['address_remove']:
             e.del_addr(addr)
         for addr in eth['address']:
             e.add_addr(addr)
 
         # remove no longer required service VLAN interfaces (vif-s)
         for vif_s in eth['vif_s_remove']:
             e.del_vlan(vif_s)
 
         # create service VLAN interfaces (vif-s)
         for vif_s in eth['vif_s']:
             s_vlan = e.add_vlan(vif_s['id'], ethertype=vif_s['ethertype'])
             apply_vlan_config(s_vlan, vif_s)
 
             # remove no longer required client VLAN interfaces (vif-c)
             # on lower service VLAN interface
             for vif_c in vif_s['vif_c_remove']:
                 s_vlan.del_vlan(vif_c)
 
             # create client VLAN interfaces (vif-c)
             # on lower service VLAN interface
             for vif_c in vif_s['vif_c']:
                 c_vlan = s_vlan.add_vlan(vif_c['id'])
                 apply_vlan_config(c_vlan, vif_c)
 
         # remove no longer required VLAN interfaces (vif)
         for vif in eth['vif_remove']:
             e.del_vlan(vif)
 
         # create VLAN interfaces (vif)
         for vif in eth['vif']:
             # QoS priority mapping can only be set during interface creation
             # so we delete the interface first if required.
             if vif['egress_qos_changed'] or vif['ingress_qos_changed']:
                 try:
                     # on system bootup the above condition is true but the interface
                     # does not exists, which throws an exception, but that's legal
                     e.del_vlan(vif['id'])
                 except:
                     pass
 
             vlan = e.add_vlan(vif['id'], ingress_qos=vif['ingress_qos'], egress_qos=vif['egress_qos'])
             apply_vlan_config(vlan, vif)
 
     return None
 
 if __name__ == '__main__':
     try:
         c = get_config()
         verify(c)
         generate(c)
         apply(c)
     except ConfigError as e:
         print(e)
         exit(1)