Merge pull request #383 from thomas-mangin/T2372

disable :T2372: disable sub-interface if parent is

1 files changed, 16 insertions, 143 deletions

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