network: update CachingNetInfo API calls

update CachingNetInfo API calls Change-Id: Ic71e6a6eec6fb67e0ba645229f056fe3f2b328c1 Bug-Url: https://bugzilla.redhat.com/1316094 Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
irosenzw · Mar 9, 2016 · 0f91a18 · 0f91a18
1 parent b63ac23
commit 0f91a18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/ovirt_hosted_engine_setup/vds_info.py b/src/ovirt_hosted_engine_setup/vds_info.py
@@ -23,7 +23,7 @@
 """
 
 
-from vdsm import netinfo
+from vdsm.netinfo.cache import CachingNetInfo
 
 
 def capabilities(conn):
@@ -66,7 +66,7 @@ def network(caps, device):
             Status is the current network status (for instance it includes
             the IP address also if the interfaces got its address by DHCP)
     """
-    info = netinfo.CachingNetInfo(caps)
+    info = CachingNetInfo(caps)
     configuration = {}
     status = {}
     if device in info.vlans:

diff --git a/src/plugins/ovirt-hosted-engine-setup/engine/add_host.py b/src/plugins/ovirt-hosted-engine-setup/engine/add_host.py
@@ -41,7 +41,7 @@
 from otopi import util
 
 
-from vdsm import netinfo
+from vdsm.netinfo.cache import CachingNetInfo
 
 
 from ovirt_host_deploy import constants as ohdcons
@@ -769,7 +769,7 @@ def _closeup(self):
                 cluster = engine_api.clusters.get(cluster_name)
 
                 conn = self.environment[ohostedcons.VDSMEnv.VDS_CLI]
-                net_info = netinfo.CachingNetInfo(vds_info.capabilities(conn))
+                net_info = CachingNetInfo(vds_info.capabilities(conn))
                 bridge_port = self.environment[
                     ohostedcons.NetworkEnv.BRIDGE_IF
                 ]

diff --git a/src/plugins/ovirt-hosted-engine-setup/network/bridge.py b/src/plugins/ovirt-hosted-engine-setup/network/bridge.py
@@ -32,7 +32,7 @@
 from otopi import plugin
 
 
-from vdsm import netinfo
+from vdsm.netinfo.cache import CachingNetInfo
 
 
 from ovirt_hosted_engine_setup import constants as ohostedcons
@@ -111,7 +111,7 @@ def _check_NM(self):
         ),
     )
     def _customization(self):
-        info = netinfo.CachingNetInfo(
+        info = CachingNetInfo(
             vds_info.capabilities(
                 self.environment[ohostedcons.VDSMEnv.VDS_CLI]
             )
@@ -193,7 +193,7 @@ def _customization(self):
         ),
     )
     def _get_existing_bridge_interface(self):
-        info = netinfo.CachingNetInfo(
+        info = CachingNetInfo(
             vds_info.capabilities(
                 self.environment[ohostedcons.VDSMEnv.VDS_CLI]
             )