Change in vdsm[master]: net: consolidate bridges.py names
ibarkan at redhat.com
ibarkan at redhat.com
Thu Dec 3 08:32:24 UTC 2015
Ido Barkan has uploaded a new change for review.
Change subject: net: consolidate bridges.py names
......................................................................
net: consolidate bridges.py names
Functions names became relative to the module
Change-Id: Id0e89c53f5507c80a260c760b6cfb0cd97697a39
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M lib/vdsm/netinfo/__init__.py
M lib/vdsm/netinfo/bridges.py
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/49628/1
diff --git a/lib/vdsm/netinfo/__init__.py b/lib/vdsm/netinfo/__init__.py
index ce70518..2ed8650 100644
--- a/lib/vdsm/netinfo/__init__.py
+++ b/lib/vdsm/netinfo/__init__.py
@@ -33,7 +33,7 @@
from .addresses import getIpAddrs, getIpInfo
from . import bonding
-from .bridges import bridgeinfo, ports, bridge_stp_state
+from . import bridges
from .dhcp import (get_dhclient_ifaces, propose_updates_to_reported_dhcp,
update_reported_dhcp, dhcp_used)
from .misc import getIfaceCfg
@@ -71,7 +71,7 @@
for dev in (link for link in getLinks() if not link.isHidden()):
if dev.isBRIDGE():
- devinfo = networking['bridges'][dev.name] = bridgeinfo(dev)
+ devinfo = networking['bridges'][dev.name] = bridges.info(dev)
elif dev.isNICLike():
devinfo = networking['nics'][dev.name] = nics.info(dev, paddr)
elif dev.isBOND():
@@ -187,8 +187,8 @@
data = {}
try:
if bridged:
- data.update({'ports': ports(iface),
- 'stp': bridge_stp_state(iface)})
+ data.update({'ports': bridges.ports(iface),
+ 'stp': bridges.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
diff --git a/lib/vdsm/netinfo/bridges.py b/lib/vdsm/netinfo/bridges.py
index b30b015..236933b 100644
--- a/lib/vdsm/netinfo/bridges.py
+++ b/lib/vdsm/netinfo/bridges.py
@@ -51,7 +51,7 @@
return opts
-def bridge_stp_state(bridge):
+def stp_state(bridge):
with open('/sys/class/net/%s/bridge/stp_state' % bridge) as stp_file:
stp = stp_file.readline()
if stp == '1\n':
@@ -73,7 +73,7 @@
raise ValueError('Invalid value for bridge stp')
-def bridgeinfo(link):
+def info(link):
return {'ports': ports(link.name),
- 'stp': bridge_stp_state(link.name),
+ 'stp': stp_state(link.name),
'opts': _bridge_options(link.name)}
--
To view, visit https://gerrit.ovirt.org/49628
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0e89c53f5507c80a260c760b6cfb0cd97697a39
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
More information about the vdsm-patches
mailing list