Change in vdsm[master]: netinfo: Move _*info back together
osvoboda at redhat.com
osvoboda at redhat.com
Fri Jun 13 12:10:19 UTC 2014
Ondřej Svoboda has uploaded a new change for review.
Change subject: netinfo: Move _*info back together
......................................................................
netinfo: Move _*info back together
Change-Id: I47700f8945b166ad706b2ccc9fd8f80641d3f89d
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M lib/vdsm/netinfo.py
1 file changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/28699/1
diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index 2bfdb93..be6d8fb 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -560,24 +560,6 @@
return data
-def _bridgeinfo(link, gateways, ipv6routes, ipaddrs):
- info = _devinfo(link, ipaddrs)
- info.update({'gateway': getgateway(gateways, link.name),
- 'ipv6gateway': ipv6routes.get(link.name, '::'),
- 'ports': ports(link.name),
- 'stp': bridge_stp_state(link.name),
- 'opts': bridgeOpts(link.name)})
- return info
-
-
-def _nicinfo(link, paddr, ipaddrs):
- info = _devinfo(link, ipaddrs)
- info.update({'hwaddr': link.address, 'speed': nicSpeed(link.name)})
- if paddr.get(link.name):
- info['permhwaddr'] = paddr[link.name]
- return info
-
-
def _randomIfaceName():
MAX_LENGTH = 15
CHARS = string.ascii_lowercase + string.ascii_uppercase + string.digits
@@ -658,6 +640,24 @@
in sorted(opts.iteritems())))
+def _bridgeinfo(link, gateways, ipv6routes, ipaddrs):
+ info = _devinfo(link, ipaddrs)
+ info.update({'gateway': getgateway(gateways, link.name),
+ 'ipv6gateway': ipv6routes.get(link.name, '::'),
+ 'ports': ports(link.name),
+ 'stp': bridge_stp_state(link.name),
+ 'opts': bridgeOpts(link.name)})
+ return info
+
+
+def _nicinfo(link, paddr, ipaddrs):
+ info = _devinfo(link, ipaddrs)
+ info.update({'hwaddr': link.address, 'speed': nicSpeed(link.name)})
+ if paddr.get(link.name):
+ info['permhwaddr'] = paddr[link.name]
+ return info
+
+
def _bondinfo(link, ipaddrs):
info = _devinfo(link, ipaddrs)
opts = getBondingOptions(link.name)
--
To view, visit http://gerrit.ovirt.org/28699
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47700f8945b166ad706b2ccc9fd8f80641d3f89d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>
More information about the vdsm-patches
mailing list