diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-09-04 17:12:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-04 17:12:04 +0200 |
| commit | b9678136eac767ece3d5a5e53f9f2b9c47c7477a (patch) | |
| tree | b7c4f8c2ec6d3416b402fb051e6390559a40a00f /python/vyos/ifconfig/bond.py | |
| parent | 088f673f5f02c364bf445f06e178e79ea7ae4411 (diff) | |
| parent | 0f1d29ac0480dc202595b96357789e6d15d49f2c (diff) | |
| download | vyos-1x-1.3.2.tar.gz vyos-1x-1.3.2.zip | |
Merge pull request #1518 from initramfs/equuleus-fix-bond-members1.3.2
backport: bonding: T4668: Fix bond members not adding/interface state incorrect
Diffstat (limited to 'python/vyos/ifconfig/bond.py')
| -rw-r--r-- | python/vyos/ifconfig/bond.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/python/vyos/ifconfig/bond.py b/python/vyos/ifconfig/bond.py index 47e0598ab..f831551d8 100644 --- a/python/vyos/ifconfig/bond.py +++ b/python/vyos/ifconfig/bond.py @@ -1,4 +1,4 @@ -# Copyright 2019-2020 VyOS maintainers and contributors <maintainers@vyos.io> +# Copyright 2019-2022 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 @@ -389,10 +389,12 @@ class BondIf(Interface): # Remove ALL bond member interfaces for interface in self.get_slaves(): self.del_port(interface) - # Removing an interface from a bond will always place the underlaying - # physical interface in admin-down state! If physical interface is - # not disabled, re-enable it. - if not dict_search(f'member.interface_remove.{interface}.disable', config): + + # Restore correct interface status based on config + if dict_search(f'member.interface.{interface}.disable', config) is not None or \ + dict_search(f'member.interface_remove.{interface}.disable', config) is not None: + Interface(interface).set_admin_state('down') + else: Interface(interface).set_admin_state('up') # Bonding policy/mode - default value, always present |