Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x: (49 commits)
  Jenkins: ease Pipeline
  vxlan: T1636: simplyfy code (don't delete intf addresses)
  ethernet: T1637: interfaces in a bond can be disabled
  ethernet: T1637: fix calling arp_cache_tmo property
  ethernet: T1637: do not overwrite interface description with interface name
  ethernet: T1637: support offloading functions
  Python/ifconfig: T1557: ethernet: add offloading interfaces
  Python/ifconfig: T1557: update comments
  Python/ifconfig: T1557: delete all assigned IP addresses on remove()
  ethernet: T1637: call remove() on interface deletion
  Python/ifconfig: T1557: use proper inheritance levels on remove()
  ethernet: T1637: remove debug pprint
  bridge: T1556: minor comment cleanup
  bonding: T1614: minor comment cleanup
  Python/ifconfig: T1557: unify '/sys/class/net/{}' path
  Python/ifconfig: T1557: vmxnet3/virtio_net do not support changing speed/duplex control
  Python/ifconfig: T1557: vmxnet3/virtio_net do not support changing flow control
  Python/ifconfig: T1557: query driver if it supports auto negotiation
  Python/ifconfig: T1557: call ethtool with full path
  Python/ifconfig: T1557: return stdout string for _cmd()
  ...

1 files changed, 3 insertions, 9 deletions

diff --git a/src/conf_mode/interface-bonding.py b/src/conf_mode/interface-bonding.py
index f0a33beff..9049913e6 100755
--- a/src/conf_mode/interface-bonding.py
+++ b/src/conf_mode/interface-bonding.py
@@ -22,7 +22,7 @@ from copy import deepcopy
 from sys import exit
 from netifaces import interfaces
 
-from vyos.ifconfig import BondIf, EthernetIf
+from vyos.ifconfig import BondIf, VLANIf
 from vyos.configdict import list_diff, vlan_to_dict
 from vyos.config import Config
 from vyos import ConfigError
@@ -82,7 +82,7 @@ def apply_vlan_config(vlan, config):
     to a VLAN interface
     """
 
-    if type(vlan) != type(EthernetIf("lo")):
+    if type(vlan) != type(VLANIf("lo")):
         raise TypeError()
 
     # update interface description used e.g. within SNMP
@@ -279,11 +279,6 @@ def verify(bond):
                 raise ConfigError('can not enslave interface {} which already ' \
                                   'belongs to {}'.format(intf, tmp))
 
-        # we can not add disabled slave interfaces to our bond
-        if conf.exists('interfaces ethernet ' + intf + ' disable'):
-            raise ConfigError('can not enslave disabled interface {}' \
-                              .format(intf))
-
         # 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 ' \
@@ -339,8 +334,7 @@ def apply(bond):
     b = BondIf(bond['intf'])
 
     if bond['deleted']:
-        #
-        # delete bonding interface
+        # delete interface
         b.remove()
     else:
         # Some parameters can not be changed when the bond is up.