Ondřej Svoboda has uploaded a new change for review. Change subject: netinfo: remove unused and hide private functions ......................................................................
netinfo: remove unused and hide private functions getVlanBondingNic (removed) and getVlanDevice (now private) were used by vdsm_reg. gethwaddr has been unused since https://gerrit.ovirt.org/23291 isvirtio since http://gerrit.ovirt.org/21542 getBridgelessNetworks since http://gerrit.ovirt.org/6416 and isbonding since https://gerrit.ovirt.org/4320 Change-Id: I9a93282b95f1d174192274c91c14c98e6f771c17 Signed-off-by: Ondřej Svoboda <[email protected]> --- M lib/vdsm/netinfo.py 1 file changed, 18 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/45084/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index dfe8994..b5e62f9 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -131,7 +131,7 @@ return f.readline().split() -def active_slave(bonding): +def _active_slave(bonding): """ :param bonding: :return: active slave when one exists or '' otherwise @@ -165,7 +165,7 @@ if opt not in _EXCLUDED_BONDING_ENTRIES)) -def bridgeOpts(bridge, keys=None): +def _bridge_options(bridge, keys=None): """Returns a dictionary of bridge option name and value. E.g., {'max_age': '2000', 'gc_timer': '332'}""" BR_KEY_BLACKLIST = ('flush',) @@ -209,7 +209,7 @@ return max([getMtu(dev) for dev in devs] + [mtu]) -def bridge_stp_state(bridge): +def _bridge_stp_state(bridge): with open('/sys/class/net/%s/bridge/stp_state' % bridge) as stp_file: stp = stp_file.readline() if stp == '1\n': @@ -231,14 +231,6 @@ raise ValueError('Invalid value for bridge stp') -def isvirtio(dev): - return 'virtio' in os.readlink('/sys/class/net/%s/device' % dev) - - -def isbonding(dev): - return os.path.exists('/sys/class/net/%s/bonding' % dev) - - def operstate(dev): with open('/sys/class/net/%s/operstate' % dev) as operstateFile: return operstateFile.read().strip() @@ -246,7 +238,7 @@ def vlanSpeed(vlanName): """Returns the vlan's underlying device speed.""" - vlanDevName = getVlanDevice(vlanName) + vlanDevName = _vlan_device(vlanName) vlanDev = getLink(vlanDevName) if vlanDev.isNIC(): speed = nicSpeed(vlanDevName) @@ -337,30 +329,6 @@ return ipv4addr, ipv4netmask, ipv4addrs, ipv6addrs -def gethwaddr(dev): - with open('/sys/class/net/%s/address' % dev) as addr: - return addr.read().strip() - - -def getVlanBondingNic(bridge): - """Return the (vlan, bonding, nics) tuple that belongs to bridge.""" - - if bridge not in bridges(): - raise ValueError('unknown bridge %s' % bridge) - vlan = bonding = '' - nics = [] - for iface in ports(bridge): - if iface in vlans(): - vlan = getVlanID(iface) - iface = getVlanDevice(iface) - if iface in bondings(): - bonding = iface - nics = slaves(iface) - else: - nics = [iface] - return vlan, bonding, nics - - def getIfaceCfg(iface): ifaceCfg = {} try: @@ -375,7 +343,7 @@ return ifaceCfg -def permAddr(): +def _permanent_address(): paddr = {} for b in bondings(): slave = '' @@ -459,7 +427,7 @@ try: if bridged: data.update({'ports': ports(iface), - 'stp': bridge_stp_state(iface)}) + 'stp': _bridge_stp_state(iface)}) else: # ovirt-engine-3.1 expects to see the "interface" attribute iff the # network is bridgeless. Please remove the attribute and this @@ -488,8 +456,8 @@ def _bridgeinfo(link): return {'ports': ports(link.name), - 'stp': bridge_stp_state(link.name), - 'opts': bridgeOpts(link.name)} + 'stp': _bridge_stp_state(link.name), + 'opts': _bridge_options(link.name)} def _nicinfo(link, paddr): @@ -501,7 +469,7 @@ def _bondinfo(link): return {'hwaddr': link.address, 'slaves': slaves(link.name), - 'active_slave': active_slave(link.name), + 'active_slave': _active_slave(link.name), 'opts': _getBondingOptions(link.name)} @@ -715,7 +683,7 @@ def get(vdsmnets=None): d = {'bondings': {}, 'bridges': {}, 'networks': {}, 'nics': {}, 'vlans': {}} - paddr = permAddr() + paddr = _permanent_address() ipaddrs = _getIpAddrs() dhcpv4_ifaces, dhcpv6_ifaces = _get_dhclient_ifaces() routes = _get_routes() @@ -756,7 +724,7 @@ return any(vlan.startswith(dev + '.') for vlan in vlans()) -def getVlanDevice(vlan): +def _vlan_device(vlan): """ Return the device of the given VLAN. """ vlanLink = getLink(vlan) return vlanLink.device @@ -840,10 +808,10 @@ def getNetworksAndVlansForIface(self, iface): """ Returns tuples of (bridge/network, vlan) connected to nic/bond """ - return chain(self.getBridgedNetworksAndVlansForIface(iface), - self.getBridgelessNetworksAndVlansForIface(iface)) + return chain(self._getBridgedNetworksAndVlansForIface(iface), + self._getBridgelessNetworksAndVlansForIface(iface)) - def getBridgedNetworksAndVlansForIface(self, iface): + def _getBridgedNetworksAndVlansForIface(self, iface): """ Returns tuples of (bridge, vlan) connected to nic/bond """ for network, netdict in self.networks.iteritems(): if netdict['bridged']: @@ -853,7 +821,7 @@ elif interface.startswith(iface + '.'): yield (network, getVlanID(interface)) - def getBridgelessNetworksAndVlansForIface(self, iface): + def _getBridgelessNetworksAndVlansForIface(self, iface): """ Returns tuples of (network, vlan) connected to nic/bond """ for network, netdict in self.networks.iteritems(): if not netdict['bridged']: @@ -863,10 +831,10 @@ yield (network, getVlanID(netdict['iface'])) def getVlansForIface(self, iface): - for vlanDevName in self.getVlanDevsForIface(iface): + for vlanDevName in self._getVlanDevsForIface(iface): yield getVlanID(vlanDevName) - def getVlanDevsForIface(self, iface): + def _getVlanDevsForIface(self, iface): for v, vdict in self.vlans.iteritems(): if iface == vdict['iface']: yield v @@ -877,12 +845,6 @@ if ('ports' in netdict and iface in netdict['ports'] or iface == netdict['iface']): return network - - def getBridgelessNetworks(self): - """ Return all bridgless networks.""" - for network, netdict in self.networks.iteritems(): - if not netdict['bridged']: - yield network def getBridgedNetworkForIface(self, iface): """ Return all bridged networks attached to nic/bond """ @@ -919,7 +881,7 @@ for port in ports: if port in self.vlans: assert vlan is None - nic = getVlanDevice(port) + nic = _vlan_device(port) vlanid = getVlanID(port) vlan = port # vlan devices can have an arbitrary name assert self.vlans[port]['iface'] == nic -- To view, visit https://gerrit.ovirt.org/45084 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a93282b95f1d174192274c91c14c98e6f771c17 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
