Merge pull request #383 from thomas-mangin/T2372

disable :T2372: disable sub-interface if parent is

5 files changed, 322 insertions, 554 deletions

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 2ce8a795f..dea8a5d01 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -18,7 +18,12 @@ A library for retrieving value dicts from VyOS configs in a declarative fashion.
 
 """
 
+from enum import Enum
+from copy import deepcopy
+
 from vyos import ConfigError
+from vyos.ifconfig import Interface
+
 
 def retrieve_config(path_hash, base_path, config):
     """
@@ -98,192 +103,338 @@ def get_ethertype(ethertype_val):
         raise ConfigError('invalid ethertype "{}"'.format(ethertype_val))
 
 
-def vlan_to_dict(conf):
+vlan_default = {
+    'address': [],
+    'address_remove': [],
+    'description': '',
+    'dhcp_client_id': '',
+    'dhcp_hostname': '',
+    'dhcp_vendor_class_id': '',
+    'dhcpv6_prm_only': False,
+    'dhcpv6_temporary': False,
+    'disable': False,
+    'disable_link_detect': 1,
+    'egress_qos': '',
+    'egress_qos_changed': False,
+    'ip_disable_arp_filter': 1,
+    'ip_enable_arp_accept': 0,
+    'ip_enable_arp_announce': 0,
+    'ip_enable_arp_ignore': 0,
+    'ip_proxy_arp': 0,
+    'ipv6_autoconf': 0,
+    'ipv6_eui64_prefix': [],
+    'ipv6_eui64_prefix_remove': [],
+    'ipv6_forwarding': 1,
+    'ipv6_dup_addr_detect': 1,
+    'ingress_qos': '',
+    'ingress_qos_changed': False,
+    'mac': '',
+    'mtu': 1500,
+    'vif_c': [],
+    'vif_c_remove': [],
+    'vrf': ''
+}
+
+# see: https://docs.python.org/3/library/enum.html#functional-api
+disable = Enum('disable','none was now both')
+
+def disable_state(conf, check=[3,5,7]):
+    """
+    return if and how a particual section of the configuration is has disable'd
+    using "disable" including if it was disabled by one of its parent.
+
+    check: a list of the level we should check, here 7,5 and 3
+          interfaces ethernet eth1 vif-s 1 vif-c 2 disable
+          interfaces ethernet eth1 vif 1 disable
+          interfaces ethernet eth1 disable
+
+    it returns an enum (none, was, now, both)
+    """
+
+    # save where we are in the config
+    current_level = conf.get_level()
+
+    # logic to figure out if the interface (or one of it parent is disabled)
+    eff_disable = False
+    act_disable = False
+
+    levels = check[:]
+    working_level = current_level[:]
+
+    while levels:
+        position = len(working_level)
+        if not position:
+            break
+        if position not in levels:
+            working_level = working_level[:-1]
+            continue
+
+        levels.remove(position)
+        conf.set_level(working_level)
+        working_level = working_level[:-1]
+
+        eff_disable = eff_disable or conf.exists_effective('disable')
+        act_disable = act_disable or conf.exists('disable')
+
+    conf.set_level(current_level)
+
+    # how the disabling changed
+    if eff_disable and act_disable:
+        return disable.both
+    if eff_disable and not eff_disable:
+        return disable.was
+    if not eff_disable and act_disable:
+        return disable.now
+    return disable.none
+
+
+def intf_to_dict(conf, default):
     """
     Common used function which will extract VLAN related information from config
     and represent the result as Python dictionary.
 
     Function call's itself recursively if a vif-s/vif-c pair is detected.
     """
-    vlan = {
-        'id': conf.get_level()[-1], # get the '100' in 'interfaces bonding bond0 vif-s 100'
-        'address': [],
-        'address_remove': [],
-        'description': '',
-        'dhcp_client_id': '',
-        'dhcp_hostname': '',
-        'dhcp_vendor_class_id': '',
-        'dhcpv6_prm_only': False,
-        'dhcpv6_temporary': False,
-        'disable': False,
-        'disable_link_detect': 1,
-        'egress_qos': '',
-        'egress_qos_changed': False,
-        'ip_disable_arp_filter': 1,
-        'ip_enable_arp_accept': 0,
-        'ip_enable_arp_announce': 0,
-        'ip_enable_arp_ignore': 0,
-        'ip_proxy_arp': 0,
-        'ipv6_autoconf': 0,
-        'ipv6_eui64_prefix': [],
-        'ipv6_eui64_prefix_remove': [],
-        'ipv6_forwarding': 1,
-        'ipv6_dup_addr_detect': 1,
-        'ingress_qos': '',
-        'ingress_qos_changed': False,
-        'mac': '',
-        'mtu': 1500,
-        'vrf': ''
-    }
+
+    intf = deepcopy(default)
+
     # retrieve configured interface addresses
     if conf.exists('address'):
-        vlan['address'] = conf.return_values('address')
-
-    # Determine interface addresses (currently effective) - to determine which
-    # address is no longer valid and needs to be removed from the bond
-    eff_addr = conf.return_effective_values('address')
-    act_addr = conf.return_values('address')
-    vlan['address_remove'] = list_diff(eff_addr, act_addr)
+        intf['address'] = conf.return_values('address')
 
     # retrieve interface description
     if conf.exists('description'):
-        vlan['description'] = conf.return_value('description')
+        intf['description'] = conf.return_value('description')
 
     # get DHCP client identifier
     if conf.exists('dhcp-options client-id'):
-        vlan['dhcp_client_id'] = conf.return_value('dhcp-options client-id')
+        intf['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'):
-        vlan['dhcp_hostname'] = conf.return_value('dhcp-options host-name')
+        intf['dhcp_hostname'] = conf.return_value('dhcp-options host-name')
 
     # DHCP client vendor identifier
     if conf.exists('dhcp-options vendor-class-id'):
-        vlan['dhcp_vendor_class_id'] = conf.return_value('dhcp-options vendor-class-id')
+        intf['dhcp_vendor_class_id'] = conf.return_value(
+            'dhcp-options vendor-class-id')
 
     # DHCPv6 only acquire config parameters, no address
     if conf.exists('dhcpv6-options parameters-only'):
-        vlan['dhcpv6_prm_only'] = True
+        intf['dhcpv6_prm_only'] = True
 
     # DHCPv6 temporary IPv6 address
     if conf.exists('dhcpv6-options temporary'):
-        vlan['dhcpv6_temporary'] = True
+        intf['dhcpv6_temporary'] = True
 
     # ignore link state changes
     if conf.exists('disable-link-detect'):
-        vlan['disable_link_detect'] = 2
-
-    # disable VLAN interface
-    if conf.exists('disable'):
-        vlan['disable'] = True
+        intf['disable_link_detect'] = 2
 
     # ARP filter configuration
     if conf.exists('ip disable-arp-filter'):
-        vlan['ip_disable_arp_filter'] = 0
+        intf['ip_disable_arp_filter'] = 0
 
     # ARP enable accept
     if conf.exists('ip enable-arp-accept'):
-        vlan['ip_enable_arp_accept'] = 1
+        intf['ip_enable_arp_accept'] = 1
 
     # ARP enable announce
     if conf.exists('ip enable-arp-announce'):
-        vlan['ip_enable_arp_announce'] = 1
+        intf['ip_enable_arp_announce'] = 1
 
     # ARP enable ignore
     if conf.exists('ip enable-arp-ignore'):
-        vlan['ip_enable_arp_ignore'] = 1
+        intf['ip_enable_arp_ignore'] = 1
 
     # Enable Proxy ARP
     if conf.exists('ip enable-proxy-arp'):
-        vlan['ip_proxy_arp'] = 1
+        intf['ip_proxy_arp'] = 1
 
     # Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)
     if conf.exists('ipv6 address autoconf'):
-        vlan['ipv6_autoconf'] = 1
+        intf['ipv6_autoconf'] = 1
 
     # Get prefixes for IPv6 addressing based on MAC address (EUI-64)
     if conf.exists('ipv6 address eui64'):
-        vlan['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
-
-    # Determine currently effective EUI64 addresses - to determine which
-    # address is no longer valid and needs to be removed
-    eff_addr = conf.return_effective_values('ipv6 address eui64')
-    vlan['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, vlan['ipv6_eui64_prefix'])
-
-    # Remove the default link-local address if set.
-    if conf.exists('ipv6 address no-default-link-local'):
-        vlan['ipv6_eui64_prefix_remove'].append('fe80::/64')
-    else:
-        # add the link-local by default to make IPv6 work
-        vlan['ipv6_eui64_prefix'].append('fe80::/64')
+        intf['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
 
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
-        vlan['ipv6_forwarding'] = 0
-
-    # IPv6 Duplicate Address Detection (DAD) tries
-    if conf.exists('ipv6 dup-addr-detect-transmits'):
-        vlan['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
+        intf['ipv6_forwarding'] = 0
 
     # Media Access Control (MAC) address
     if conf.exists('mac'):
-        vlan['mac'] = conf.return_value('mac')
-        # always recreate EUI64 addresses if mac is set
-        # I'm not sure how to check if a vlan interface exists or how to get its current mac.
-        vlan['ipv6_eui64_prefix_remove'] += vlan['ipv6_eui64_prefix']
+        intf['mac'] = conf.return_value('mac')
+
+    # IPv6 Duplicate Address Detection (DAD) tries
+    if conf.exists('ipv6 dup-addr-detect-transmits'):
+        intf['ipv6_dup_addr_detect'] = int(
+            conf.return_value('ipv6 dup-addr-detect-transmits'))
 
     # Maximum Transmission Unit (MTU)
     if conf.exists('mtu'):
-        vlan['mtu'] = int(conf.return_value('mtu'))
+        intf['mtu'] = int(conf.return_value('mtu'))
 
     # retrieve VRF instance
     if conf.exists('vrf'):
-        vlan['vrf'] = conf.return_value('vrf')
+        intf['vrf'] = conf.return_value('vrf')
 
-    # VLAN egress QoS
+    #  egress QoS
     if conf.exists('egress-qos'):
-        vlan['egress_qos'] = conf.return_value('egress-qos')
+        intf['egress_qos'] = conf.return_value('egress-qos')
 
     # egress changes QoS require VLAN interface recreation
     if conf.return_effective_value('egress-qos'):
-        if vlan['egress_qos'] != conf.return_effective_value('egress-qos'):
-            vlan['egress_qos_changed'] = True
+        if intf['egress_qos'] != conf.return_effective_value('egress-qos'):
+            intf['egress_qos_changed'] = True
 
-    # VLAN ingress QoS
+    # ingress QoS
     if conf.exists('ingress-qos'):
-        vlan['ingress_qos'] = conf.return_value('ingress-qos')
+        intf['ingress_qos'] = conf.return_value('ingress-qos')
 
     # ingress changes QoS require VLAN interface recreation
     if conf.return_effective_value('ingress-qos'):
-        if vlan['ingress_qos'] != conf.return_effective_value('ingress-qos'):
-            vlan['ingress_qos_changed'] = True
+        if intf['ingress_qos'] != conf.return_effective_value('ingress-qos'):
+            intf['ingress_qos_changed'] = True
 
-    # ethertype is mandatory on vif-s nodes and only exists here!
-    # check if this is a vif-s node at all:
-    if conf.get_level()[-2] == 'vif-s':
-        vlan['vif_c'] = []
-        vlan['vif_c_remove'] = []
-
-        # ethertype uses a default of 0x88A8
-        tmp = '0x88A8'
-        if conf.exists('ethertype'):
-             tmp = conf.return_value('ethertype')
-        vlan['ethertype'] = get_ethertype(tmp)
-
-        # get vif-c interfaces (currently effective) - to determine which vif-c
+    disabled = disable_state(conf)
+
+    # Get the interface IPs
+    eff_addr = conf.return_effective_values('address')
+    act_addr = conf.return_values('address')
+
+    # Get prefixes for IPv6 addressing based on MAC address (EUI-64)
+    eff_eui = conf.return_effective_values('ipv6 address eui64')
+    act_eui = conf.return_values('ipv6 address eui64')
+
+    # Determine what should stay or be removed
+    if disabled == disable.both:
+        # was and is still disabled
+        intf['disable'] = True
+        intf['address_remove'] = []
+        intf['address'] = []
+        intf['ipv6_eui64_prefix'] = []
+        intf['ipv6_eui64_prefix_remove'] = []
+    elif disabled == disable.now:
+        # it is now disable but was not before
+        intf['disable'] = True
+        intf['address_remove'] = eff_addr
+        intf['address'] = []
+        intf['ipv6_eui64_prefix'] = eff_eui
+        intf['ipv6_eui64_prefix_remove'] = []
+    elif disabled == disable.was:
+        # it was disable but not anymore
+        intf['disable'] = False
+        intf['address_remove'] = []
+        intf['address'] = act_addr
+        intf['ipv6_eui64_prefix'] = []
+        intf['ipv6_eui64_prefix_remove'] = act_eui
+    else:
+        # normal change
+        intf['disable'] = False
+        intf['address_remove'] = list_diff(eff_addr, act_addr)
+        intf['address'] = act_addr
+        intf['ipv6_eui64_prefix_remove'] = list_diff(eff_eui, act_eui)
+        intf['ipv6_eui64_prefix'] = act_eui
+
+    # Remove the default link-local address if set.
+    if conf.exists('ipv6 address no-default-link-local'):
+        intf['ipv6_eui64_prefix_remove'].append('fe80::/64')
+    else:
+        # add the link-local by default to make IPv6 work
+        intf['ipv6_eui64_prefix'].append('fe80::/64')
+
+    # Find out if MAC has changed
+    try:
+        interface = Interface(intf['intf'], create=False)
+        if intf['mac'] and intf['mac'] != interface.get_mac():
+            intf['ipv6_eui64_prefix_remove'] += intf['ipv6_eui64_prefix']
+    except Exception:
+        # If the interface does not exists, it can not have changed
+        pass
+
+    return intf, disable
+
+
+
+def add_to_dict(conf, disabled, ifdict, section, key):
+    """
+    parse a section of vif/vif-s/vif-c and add them to the dict
+    follow the convention to:
+    * use the "key" for what to add
+    * use the "key" what what to remove
+
+    conf:     is the Config() already at the level we need to parse
+    disabled: is a disable enum so we know how to handle to data
+    intf:     if the interface dictionary
+    section:  is the section name to parse (vif/vif-s/vif-c)
+    key:      is the dict key to use (vif/vifs/vifc)
+    """
+
+    if not conf.exists(section):
+        return ifdict
+
+    effect = conf.list_effective_nodes(section)
+    active = conf.list_nodes(section)
+
+    # the section to parse for vlan
+    sections = []
+
+    # Determine interface addresses (currently effective) - to determine which
+    # address is no longer valid and needs to be removed from the bond
+    if disabled == disable.both:
+        # was and is still disabled
+        ifdict[f'{key}_remove'] = []
+    elif disabled == disable.now:
+        # it is now disable but was not before
+        ifdict[f'{key}_remove'] = effect
+    elif disabled == disable.was:
+        # it was disable but not anymore
+        ifdict[f'{key}_remove'] = []
+        sections = active
+    else:
+        # normal change
+        # 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-c')
-        act_intf = conf.list_nodes('vif-c')
-        vlan['vif_c_remove'] = list_diff(eff_intf, act_intf)
-
-        # check if there is a Q-in-Q vlan customer interface
-        # and call this function recursively
-        if conf.exists('vif-c'):
-            cfg_level = conf.get_level()
-            # add new key (vif-c) to dictionary
-            for vif in conf.list_nodes('vif-c'):
-                # set config level to vif interface
-                conf.set_level(cfg_level + ['vif-c', vif])
-                vlan['vif_c'].append(vlan_to_dict(conf))
+        ifdict[f'{key}_remove'] = list_diff(effect, active)
+        sections = active
+
+    current_level = conf.get_level()
+
+    # add each section, the key must already exists
+    for s in sections:
+        # set config level to vif interface
+        conf.set_level(current_level + [section, s])
+        ifdict[f'{key}'].append(vlan_to_dict(conf))
+
+    # re-set configuration level to leave things as found
+    conf.set_level(current_level)
+
+    return ifdict
+
+
+def vlan_to_dict(conf, default=vlan_default):
+    vlan, disabled = intf_to_dict(conf, default)
+    # get the '100' in 'interfaces bonding bond0 vif-s 100
+    vlan['id'] = conf.get_level()[-1]
+
+    current_level = conf.get_level()
+
+    # if this is a not within vif-s node, we are done
+    if current_level[-2] != 'vif-s':
+        return vlan
+
+    # ethertype is mandatory on vif-s nodes and only exists here!
+    # ethertype uses a default of 0x88A8
+    tmp = '0x88A8'
+    if conf.exists('ethertype'):
+        tmp = conf.return_value('ethertype')
+    vlan['ethertype'] = get_ethertype(tmp)
+
+    # check if there is a Q-in-Q vlan customer interface
+    # and call this function recursively
+
+    add_to_dict(conf, disable, vlan, 'vif-c', 'vif_c')
 
     return vlan
diff --git a/python/vyos/ifconfig/vlan.py b/python/vyos/ifconfig/vlan.py
index 7b1e00d87..d68e8f6cd 100644
--- a/python/vyos/ifconfig/vlan.py
+++ b/python/vyos/ifconfig/vlan.py
@@ -101,26 +101,26 @@ class VLAN:
         >>> i.add_vlan(10)
         """
         vlan_ifname = self.config['ifname'] + '.' + str(vlan_id)
-        if not os.path.exists(f'/sys/class/net/{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 {ifname} name {ifname}.{vlan} type vlan {proto} id {vlan} {opt_e} {opt_i}' \
-                .format(ifname=self.config['ifname'], vlan=self._vlan_id, proto=ethertype, opt_e=opt_e, opt_i=opt_i)
-            self._cmd(cmd)
+        if os.path.exists(f'/sys/class/net/{vlan_ifname}'):
+            return self.__class__(vlan_ifname)
+
+        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 {ifname} name {ifname}.{vlan} type vlan {proto} id {vlan} {opt_e} {opt_i}' \
+            .format(ifname=self.ifname, vlan=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
diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index 4aef486b4..34ea4f8f8 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -22,7 +22,7 @@ from netifaces import interfaces
 
 from vyos.ifconfig import BondIf, Section
 from vyos.ifconfig_vlan import apply_vlan_config, verify_vlan_config
-from vyos.configdict import list_diff, vlan_to_dict
+from vyos.configdict import list_diff, intf_to_dict, add_to_dict
 from vyos.config import Config
 from vyos.util import call
 from vyos.validate import is_bridge_member
@@ -90,6 +90,13 @@ def get_bond_mode(mode):
         raise ConfigError('invalid bond mode "{}"'.format(mode))
 
 def get_config():
+    # determine tagNode instance
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    ifname = os.environ['VYOS_TAGNODE_VALUE']
+    conf = Config()
+
     # initialize kernel module if not loaded
     if not os.path.isfile('/sys/class/net/bonding_masters'):
         import syslog
@@ -98,34 +105,21 @@ def get_config():
             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
-    if 'VYOS_TAGNODE_VALUE' not in os.environ:
-        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
-
-    bond['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-
     # check if bond has been removed
-    cfg_base = 'interfaces bonding ' + bond['intf']
+    cfg_base = 'interfaces bonding ' + ifname
     if not conf.exists(cfg_base):
+        bond = deepcopy(default_config_data)
+        bond['intf'] = ifname
         bond['deleted'] = True
         # check if interface is member if a bridge
-        bond['is_bridge_member'] = is_bridge_member(conf, bond['intf'])
+        bond['is_bridge_member'] = is_bridge_member(conf, ifname)
         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'])
+    bond, disabled = intf_to_dict(conf, default_config_data)
+    bond['intf'] = ifname
 
     # ARP link monitoring frequency in milliseconds
     if conf.exists('arp-monitor interval'):
@@ -135,38 +129,6 @@ def get_config():
     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')
-
-    # DHCP client vendor identifier
-    if conf.exists('dhcp-options vendor-class-id'):
-        bond['dhcp_vendor_class_id'] = conf.return_value('dhcp-options vendor-class-id')
-
-    # DHCPv6 only acquire config parameters, no address
-    if conf.exists('dhcpv6-options parameters-only'):
-        bond['dhcpv6_prm_only'] = True
-
-    # DHCPv6 temporary IPv6 address
-    if conf.exists('dhcpv6-options temporary'):
-        bond['dhcpv6_temporary'] = True
-
-    # 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')
@@ -175,68 +137,10 @@ def get_config():
     if conf.exists('ip arp-cache-timeout'):
         bond['ip_arp_cache_tmo'] = int(conf.return_value('ip arp-cache-timeout'))
 
-    # ARP filter configuration
-    if conf.exists('ip disable-arp-filter'):
-        bond['ip_disable_arp_filter'] = 0
-
-    # ARP enable accept
-    if conf.exists('ip enable-arp-accept'):
-        bond['ip_enable_arp_accept'] = 1
-
-    # ARP enable announce
-    if conf.exists('ip enable-arp-announce'):
-        bond['ip_enable_arp_announce'] = 1
-
-    # ARP enable ignore
-    if conf.exists('ip enable-arp-ignore'):
-        bond['ip_enable_arp_ignore'] = 1
-
-    # 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
 
-    # Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)
-    if conf.exists('ipv6 address autoconf'):
-        bond['ipv6_autoconf'] = 1
-
-    # Get prefixes for IPv6 addressing based on MAC address (EUI-64)
-    if conf.exists('ipv6 address eui64'):
-        bond['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
-
-    # Determine currently effective EUI64 addresses - to determine which
-    # address is no longer valid and needs to be removed
-    eff_addr = conf.return_effective_values('ipv6 address eui64')
-    bond['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, bond['ipv6_eui64_prefix'])
-
-    # Remove the default link-local address if set.
-    if conf.exists('ipv6 address no-default-link-local'):
-        bond['ipv6_eui64_prefix_remove'].append('fe80::/64')
-    else:
-        # add the link-local by default to make IPv6 work
-        bond['ipv6_eui64_prefix'].append('fe80::/64')
-
-    # Disable IPv6 forwarding on this interface
-    if conf.exists('ipv6 disable-forwarding'):
-        bond['ipv6_forwarding'] = 0
-
-    # IPv6 Duplicate Address Detection (DAD) tries
-    if conf.exists('ipv6 dup-addr-detect-transmits'):
-        bond['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
-
-    # Media Access Control (MAC) address
-    if conf.exists('mac'):
-        bond['mac'] = conf.return_value('mac')
-
-    # Find out if MAC has changed - if so, we need to delete all IPv6 EUI64 addresses
-    # before re-adding them
-    if ( bond['mac'] and bond['intf'] in Section.interfaces(section='bonding')
-            and bond['mac'] != BondIf(bond['intf'], create=False).get_mac() ):
-        bond['ipv6_eui64_prefix_remove'] += bond['ipv6_eui64_prefix']
-
     # Bonding mode
     if conf.exists('mode'):
         act_mode = conf.return_value('mode')
@@ -246,10 +150,6 @@ def get_config():
 
         bond['mode'] = get_bond_mode(act_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')
@@ -266,35 +166,8 @@ def get_config():
     if conf.exists('primary'):
         bond['primary'] = conf.return_value('primary')
 
-    # retrieve VRF instance
-    if conf.exists('vrf'):
-        bond['vrf'] = conf.return_value('vrf')
-
-    # 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 to parse new nodes
-    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))
+    add_to_dict(conf, disabled, bond, 'vif', 'vif')
+    add_to_dict(conf, disabled, bond, 'vif-s', 'vif_s')
 
     return bond
 
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 43d97916d..3ddd394d7 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -22,7 +22,7 @@ from netifaces import interfaces
 
 from vyos.ifconfig import EthernetIf, Section
 from vyos.ifconfig_vlan import apply_vlan_config, verify_vlan_config
-from vyos.configdict import list_diff, vlan_to_dict
+from vyos.configdict import list_diff, intf_to_dict, add_to_dict
 from vyos.config import Config
 from vyos import ConfigError
 
@@ -70,18 +70,18 @@ default_config_data = {
 }
 
 def get_config():
-    eth = deepcopy(default_config_data)
-    conf = Config()
-
     # determine tagNode instance
     if 'VYOS_TAGNODE_VALUE' not in os.environ:
         raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
 
-    eth['intf'] = os.environ['VYOS_TAGNODE_VALUE']
+    ifname = os.environ['VYOS_TAGNODE_VALUE']
+    conf = Config()
 
     # check if ethernet interface has been removed
-    cfg_base = ['interfaces', 'ethernet', eth['intf']]
+    cfg_base = ['interfaces', 'ethernet', ifname]
     if not conf.exists(cfg_base):
+        eth = deepcopy(default_config_data)
+        eth['intf'] = ifname
         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.
@@ -91,42 +91,8 @@ def get_config():
     # 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')
-
-    # DHCP client vendor identifier
-    if conf.exists('dhcp-options vendor-class-id'):
-        eth['dhcp_vendor_class_id'] = conf.return_value('dhcp-options vendor-class-id')
-
-    # DHCPv6 only acquire config parameters, no address
-    if conf.exists('dhcpv6-options parameters-only'):
-        eth['dhcpv6_prm_only'] = True
-
-    # DHCPv6 temporary IPv6 address
-    if conf.exists('dhcpv6-options temporary'):
-        eth['dhcpv6_temporary'] = True
-
-    # ignore link state changes
-    if conf.exists('disable-link-detect'):
-        eth['disable_link_detect'] = 2
+    eth, disabled = intf_to_dict(conf, default_config_data)
+    eth['intf'] = ifname
 
     # disable ethernet flow control (pause frames)
     if conf.exists('disable-flow-control'):
@@ -136,10 +102,6 @@ def get_config():
     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')
@@ -148,72 +110,10 @@ def get_config():
     if conf.exists('ip arp-cache-timeout'):
         eth['ip_arp_cache_tmo'] = int(conf.return_value('ip arp-cache-timeout'))
 
-    # ARP filter configuration
-    if conf.exists('ip disable-arp-filter'):
-        eth['ip_disable_arp_filter'] = 0
-
-    # ARP enable accept
-    if conf.exists('ip enable-arp-accept'):
-        eth['ip_enable_arp_accept'] = 1
-
-    # ARP enable announce
-    if conf.exists('ip enable-arp-announce'):
-        eth['ip_enable_arp_announce'] = 1
-
-    # ARP enable ignore
-    if conf.exists('ip enable-arp-ignore'):
-        eth['ip_enable_arp_ignore'] = 1
-
-    # 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
 
-    # Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)
-    if conf.exists('ipv6 address autoconf'):
-        eth['ipv6_autoconf'] = 1
-
-    # Get prefixes for IPv6 addressing based on MAC address (EUI-64)
-    if conf.exists('ipv6 address eui64'):
-        eth['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
-
-    # Determine currently effective EUI64 addresses - to determine which
-    # address is no longer valid and needs to be removed
-    eff_addr = conf.return_effective_values('ipv6 address eui64')
-    eth['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, eth['ipv6_eui64_prefix'])
-
-    # Remove the default link-local address if set.
-    if conf.exists('ipv6 address no-default-link-local'):
-        eth['ipv6_eui64_prefix_remove'].append('fe80::/64')
-    else:
-        # add the link-local by default to make IPv6 work
-        eth['ipv6_eui64_prefix'].append('fe80::/64')
-
-    # Disable IPv6 forwarding on this interface
-    if conf.exists('ipv6 disable-forwarding'):
-        eth['ipv6_forwarding'] = 0
-
-    # IPv6 Duplicate Address Detection (DAD) tries
-    if conf.exists('ipv6 dup-addr-detect-transmits'):
-        eth['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
-
-    # Media Access Control (MAC) address
-    if conf.exists('mac'):
-        eth['mac'] = conf.return_value('mac')
-
-    # Find out if MAC has changed - if so, we need to delete all IPv6 EUI64 addresses
-    # before re-adding them
-    if ( eth['mac'] and eth['intf'] in Section.interfaces(section='ethernet')
-            and eth['mac'] != EthernetIf(eth['intf'], create=False).get_mac() ):
-        eth['ipv6_eui64_prefix_remove'] += eth['ipv6_eui64_prefix']
-
-    # 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')
@@ -238,37 +138,8 @@ def get_config():
     if conf.exists('speed'):
         eth['speed'] = conf.return_value('speed')
 
-    # retrieve VRF instance
-    if conf.exists('vrf'):
-        eth['vrf'] = conf.return_value('vrf')
-
-    # re-set configuration level to parse new nodes
-    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 to parse new nodes
-    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))
+    add_to_dict(conf, disabled, eth, 'vif', 'vif')
+    add_to_dict(conf, disabled, eth, 'vif-s', 'vif_s')
 
     return eth
 
diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index 57b282291..f0f893b44 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -21,7 +21,7 @@ from sys import exit
 from netifaces import interfaces
 
 from vyos.config import Config
-from vyos.configdict import list_diff, vlan_to_dict
+from vyos.configdict import list_diff, vlan_to_dict, intf_to_dict, add_to_dict
 from vyos.ifconfig import MACVLANIf, Section
 from vyos.ifconfig_vlan import apply_vlan_config, verify_vlan_config
 from vyos.validate import is_bridge_member
@@ -65,123 +65,36 @@ default_config_data = {
 }
 
 def get_config():
-    peth = deepcopy(default_config_data)
-    conf = Config()
-
     # determine tagNode instance
     if 'VYOS_TAGNODE_VALUE' not in os.environ:
         raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
 
-    peth['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    cfg_base = ['interfaces', 'pseudo-ethernet', peth['intf']]
+    ifname = os.environ['VYOS_TAGNODE_VALUE']
+    conf = Config()
 
     # Check if interface has been removed
+    cfg_base = ['interfaces', 'pseudo-ethernet', ifname]
     if not conf.exists(cfg_base):
+        peth = deepcopy(default_config_data)
         peth['deleted'] = True
         # check if interface is member if a bridge
-        peth['is_bridge_member'] = is_bridge_member(conf, peth['intf'])
+        peth['is_bridge_member'] = is_bridge_member(conf, ifname)
         return peth
 
     # set new configuration level
     conf.set_level(cfg_base)
 
-    # retrieve configured interface addresses
-    if conf.exists(['address']):
-        peth['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'])
-    peth['address_remove'] = list_diff(eff_addr, peth['address'])
-
-    # retrieve interface description
-    if conf.exists(['description']):
-        peth['description'] = conf.return_value(['description'])
-
-    # get DHCP client identifier
-    if conf.exists(['dhcp-options', 'client-id']):
-        peth['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']):
-        peth['dhcp_hostname'] = conf.return_value(['dhcp-options', 'host-name'])
-
-    # DHCP client vendor identifier
-    if conf.exists(['dhcp-options', 'vendor-class-id']):
-        peth['dhcp_vendor_class_id'] = conf.return_value(['dhcp-options', 'vendor-class-id'])
-
-    # DHCPv6 only acquire config parameters, no address
-    if conf.exists(['dhcpv6-options parameters-only']):
-        peth['dhcpv6_prm_only'] = True
-
-    # DHCPv6 temporary IPv6 address
-    if conf.exists(['dhcpv6-options temporary']):
-        peth['dhcpv6_temporary'] = True
-
-    # disable interface
-    if conf.exists(['disable']):
-        peth['disable'] = True
-
-    # ignore link state changes
-    if conf.exists(['disable-link-detect']):
-        peth['disable_link_detect'] = 2
+    peth, disabled = intf_to_dict(conf, default_config_data)
+    peth['intf'] = ifname
 
     # ARP cache entry timeout in seconds
     if conf.exists(['ip', 'arp-cache-timeout']):
         peth['ip_arp_cache_tmo'] = int(conf.return_value(['ip', 'arp-cache-timeout']))
 
-    # ARP filter configuration
-    if conf.exists(['ip', 'disable-arp-filter']):
-        peth['ip_disable_arp_filter'] = 0
-
-    # ARP enable accept
-    if conf.exists(['ip', 'enable-arp-accept']):
-        peth['ip_enable_arp_accept'] = 1
-
-    # ARP enable announce
-    if conf.exists(['ip', 'enable-arp-announce']):
-        peth['ip_enable_arp_announce'] = 1
-
-    # ARP enable ignore
-    if conf.exists(['ip', 'enable-arp-ignore']):
-        peth['ip_enable_arp_ignore'] = 1
-
-    # Enable proxy-arp on this interface
-    if conf.exists(['ip', 'enable-proxy-arp']):
-        peth['ip_proxy_arp'] = 1
-
     # Enable private VLAN proxy ARP on this interface
     if conf.exists(['ip', 'proxy-arp-pvlan']):
         peth['ip_proxy_arp_pvlan'] = 1
 
-    # Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)
-    if conf.exists('ipv6 address autoconf'):
-        peth['ipv6_autoconf'] = 1
-
-    # Get prefixes for IPv6 addressing based on MAC address (EUI-64)
-    if conf.exists('ipv6 address eui64'):
-        peth['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
-
-    # Determine currently effective EUI64 addresses - to determine which
-    # address is no longer valid and needs to be removed
-    eff_addr = conf.return_effective_values('ipv6 address eui64')
-    peth['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, peth['ipv6_eui64_prefix'])
-
-    # Remove the default link-local address if set.
-    if conf.exists('ipv6 address no-default-link-local'):
-        peth['ipv6_eui64_prefix_remove'].append('fe80::/64')
-    else:
-        # add the link-local by default to make IPv6 work
-        peth['ipv6_eui64_prefix'].append('fe80::/64')
-
-    # Disable IPv6 forwarding on this interface
-    if conf.exists('ipv6 disable-forwarding'):
-        peth['ipv6_forwarding'] = 0
-
-    # IPv6 Duplicate Address Detection (DAD) tries
-    if conf.exists('ipv6 dup-addr-detect-transmits'):
-        peth['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
-
     # Physical interface
     if conf.exists(['source-interface']):
         peth['source_interface'] = conf.return_value(['source-interface'])
@@ -189,52 +102,12 @@ def get_config():
         if tmp != peth['source_interface']:
             peth['source_interface_changed'] = True
 
-    # Media Access Control (MAC) address
-    if conf.exists(['mac']):
-        peth['mac'] = conf.return_value(['mac'])
-
-    # Find out if MAC has changed - if so, we need to delete all IPv6 EUI64 addresses
-    # before re-adding them
-    if ( peth['mac'] and peth['intf'] in Section.interfaces(section='pseudo-ethernet')
-            and peth['mac'] != MACVLANIf(peth['intf'], create=False).get_mac() ):
-        peth['ipv6_eui64_prefix_remove'] += peth['ipv6_eui64_prefix']
-
     # MACvlan mode
     if conf.exists(['mode']):
         peth['mode'] = conf.return_value(['mode'])
 
-    # retrieve VRF instance
-    if conf.exists('vrf'):
-        peth['vrf'] = conf.return_value('vrf')
-
-    # re-set configuration level to parse new nodes
-    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')
-    peth['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])
-            peth['vif_s'].append(vlan_to_dict(conf))
-
-    # re-set configuration level to parse new nodes
-    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')
-    peth['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])
-            peth['vif'].append(vlan_to_dict(conf))
-
+    add_to_dict(conf, disabled, peth, 'vif', 'vif')
+    add_to_dict(conf, disabled, peth, 'vif-s', 'vif_s')
 
     return peth
 
@@ -248,10 +121,10 @@ def verify(peth):
         return None
 
     if not peth['source_interface']:
-        raise ConfigError('Link device must be set for virtual ethernet {}'.format(peth['intf']))
+        raise ConfigError('source-interface must be set for virtual ethernet {}'.format(peth['intf']))
 
     if not peth['source_interface'] in interfaces():
-        raise ConfigError('Pseudo-ethernet source interface does not exist')
+        raise ConfigError('Pseudo-ethernet source-interface does not exist')
 
     vrf_name = peth['vrf']
     if vrf_name and vrf_name not in interfaces():