Merge pull request #4917 from c-po/bond-no-always-remove-member

bond: T2416: support hot-add/remove of bond member interfaces

2 files changed, 2 insertions, 4 deletions

diff --git a/src/conf_mode/interfaces_bonding.py b/src/conf_mode/interfaces_bonding.py
index e6aaa3440..0b27c8cad 100755
--- a/src/conf_mode/interfaces_bonding.py
+++ b/src/conf_mode/interfaces_bonding.py
@@ -104,7 +104,6 @@ def get_config(config=None):
     conf.set_level(['interfaces'])
 
     if interfaces_removed:
-        bond['shutdown_required'] = {}
         if 'member' not in bond:
             bond['member'] = {}
 
@@ -140,7 +139,6 @@ def get_config(config=None):
 
             # Check if member interface is a new member
             if not conf.exists_effective(base + [ifname, 'member', 'interface', interface]):
-                bond['shutdown_required'] = {}
                 bond['member']['interface'][interface].update({'new_added' : {}})
 
             if 'disable' in interface_ethernet_config:
diff --git a/src/op_mode/show-bond.py b/src/op_mode/show-bond.py
index 0be3ae215..19abc440a 100755
--- a/src/op_mode/show-bond.py
+++ b/src/op_mode/show-bond.py
@@ -60,7 +60,7 @@ elif args.slaves:
         cfg_dict['mode'] = tmp.get_mode()
         cfg_dict['admin_state'] = tmp.get_admin_state()
         cfg_dict['oper_state'] = tmp.operational.get_state()
-        cfg_dict['members'] = tmp.get_slaves()
+        cfg_dict['members'] = tmp.get_members()
         data.append(cfg_dict)
 
 elif args.interface:
@@ -74,7 +74,7 @@ elif args.interface:
 
     # each bond member interface has its own statistics
     data['members'] = []
-    for member in BondIf(args.interface).get_slaves():
+    for member in BondIf(args.interface).get_members():
         tmp = {}
         tmp['ifname'] = member
         tmp['rx_bytes'] = read_file(f'/sys/class/net/{member}/statistics/rx_bytes')