Change in vdsm[master]: net: reuse running config instance in netinfo.

ibarkan at redhat.com ibarkan at redhat.com
Thu Sep 24 07:12:00 UTC 2015


Ido Barkan has uploaded a new change for review.

Change subject: net: reuse running config instance in netinfo.
......................................................................

net: reuse running config instance in netinfo.

running config is already read from the disk once during get() and
this info can be later used in libvirtNets2vdsm instead of reading it
again.

Change-Id: Ia832e54567e9d07bd1a120840e9f3f716d9449cf
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M lib/vdsm/netinfo.py
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/46648/1

diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index 1ca5c06..1e4bb92 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -747,15 +747,16 @@
     return routes
 
 
-def libvirtNets2vdsm(nets, routes=None, ipAddrs=None, dhcpv4_ifaces=None,
-                     dhcpv6_ifaces=None):
+def libvirtNets2vdsm(nets, running_config=None, routes=None, ipAddrs=None,
+                     dhcpv4_ifaces=None, dhcpv6_ifaces=None):
+    if running_config is None:
+        running_config = RunningConfig()
     if routes is None:
         routes = _get_routes()
     if ipAddrs is None:
         ipAddrs = _getIpAddrs()
     if dhcpv4_ifaces is None or dhcpv6_ifaces is None:
         dhcpv4_ifaces, dhcpv6_ifaces = _get_dhclient_ifaces()
-    running_config = RunningConfig()
     d = {}
     for net, netAttr in nets.iteritems():
         try:
@@ -779,8 +780,8 @@
 
     if vdsmnets is None:
         libvirt_nets = networks()
-        d['networks'] = libvirtNets2vdsm(libvirt_nets, routes, ipaddrs,
-                                         dhcpv4_ifaces, dhcpv6_ifaces)
+        d['networks'] = libvirtNets2vdsm(libvirt_nets, running_config, routes,
+                                         ipaddrs, dhcpv4_ifaces, dhcpv6_ifaces)
     else:
         d['networks'] = vdsmnets
 


-- 
To view, visit https://gerrit.ovirt.org/46648
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia832e54567e9d07bd1a120840e9f3f716d9449cf
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