net: Drop netinfo.bonding.slaves function

Use link.bond driver to fetch the current slaves of a bond, replacing
netinfo.bonding.

This is the first patch in a series of patches that aim to cleanup
netinfo.bonding and use the bond driver instead.

Change-Id: I14f81b0ef91756d49e0473f987732ebd1d97378a
Signed-off-by: Edward Haas <[email protected]>

lib/vdsm/network/configurators/ifcfg.py

@@ -50,6 +50,7 @@
 from vdsm.network import libvirt
 from vdsm.network.ip import address
 from vdsm.network.ip import dhclient
+from vdsm.network.link.bond import Bond
 from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig
 from vdsm.network.netinfo import (bonding as netinfo_bonding, mtus, nics,
                                   vlans, misc, NET_PATH)
@@ -770,7 +771,7 @@ def setIfaceMtu(self, iface, newmtu):
 
     def setBondingMtu(self, bonding, newmtu):
         self.setIfaceMtu(bonding, newmtu)
-        slaves = netinfo_bonding.slaves(bonding)
+        slaves = Bond(bonding).slaves
         for slave in slaves:
             self.setIfaceMtu(slave, newmtu)
 

lib/vdsm/network/configurators/iproute2.py

@@ -27,6 +27,7 @@
 from vdsm.network.ip import dhclient
 from vdsm.network.ipwrapper import (routeAdd, routeDel, ruleAdd, ruleDel,
                                     IPRoute2Error)
+from vdsm.network.link.bond import Bond
 from vdsm.network.netinfo import bonding, vlans, bridges, mtus
 from vdsm.network.netinfo.cache import ifaceUsed
 from vdsm.constants import EXT_BRCTL
@@ -98,7 +99,7 @@ def configureBond(self, bond, **opts):
             self.configApplier.ifdown(bond)
             self.configApplier.addBondOptions(bond)
         for slave in bond.slaves:
-            if slave.name not in bonding.slaves(bond.name):
+            if slave.name not in Bond(bond.name).slaves:
                 self.configApplier.addBondSlave(bond, slave)
                 slave.configure(**opts)
         if bond.ipv4.bootproto == 'dhcp':

lib/vdsm/network/models.py

@@ -21,6 +21,7 @@
 import six
 import re
 
+from vdsm.network.link import bond as link_bond
 from vdsm.network.netinfo import bonding, mtus, nics
 from vdsm.network.netinfo.cache import ifaceUsed, CachingNetInfo
 from vdsm.network.ip.address import IPv4, IPv6
@@ -237,7 +238,7 @@ def configure(self, **opts):
             self.mtu <= mtus.getMtu(self.name) and
             self.areOptionsApplied() and
             frozenset(slave.name for slave in self.slaves) ==
-                frozenset(bonding.slaves(self.name))):
+                frozenset(link_bond.Bond(self.name).slaves)):
                 return
 
         self.configurator.configureBond(self, **opts)

lib/vdsm/network/netinfo/bonding.py

@@ -34,6 +34,8 @@
 from .misc import visible_devs
 from . import nics
 
+from vdsm.network.link.bond import Bond
+
 # In order to limit the scope of change, this module is now acting as a proxy
 # to the link.bond.sysfs_options module.
 from vdsm.network.link.bond.sysfs_options import _bond_opts_read_elements
@@ -66,11 +68,6 @@
 bondings = partial(visible_devs, Link.isBOND)
 
 
-def slaves(bond_name):
-    with open(BONDING_SLAVES % bond_name) as f:
-        return f.readline().split()
-
-
 def _file_value(path):
     if os.path.exists(path):
         with open(path, 'r') as f:
@@ -94,7 +91,7 @@ def get_bond_agg_info(bond_name):
 
 
 def info(link):
-    return {'hwaddr': link.address, 'slaves': slaves(link.name),
+    return {'hwaddr': link.address, 'slaves': list(Bond(link.name).slaves),
             'active_slave': _active_slave(link.name),
             'opts': _getBondingOptions(link.name)}
 

vdsm_hooks/ethtool_options/ethtool_options.py

@@ -23,7 +23,7 @@
 import hooking
 import traceback
 
-from vdsm.network.netinfo import bonding
+from vdsm.network.link.bond import Bond
 from vdsm.utils import CommandPath
 
 ETHTOOL_BINARY = CommandPath(
@@ -119,7 +119,7 @@ def _process_network(network, attrs):
 
 def _net_nics(attrs):
     if 'bonding' in attrs:
-        return bonding.slaves(attrs['bonding'])
+        return Bond(attrs['bonding']).slaves
     else:
         return [attrs.pop('nic')] if 'nic' in attrs else ()