[PATCH 13/17] Replace hasActiveNetDev() using new nm module

Radek Vykydal rvykydal at redhat.com
Fri Feb 8 14:04:29 UTC 2013


---
 anaconda                                   |  4 ++--
 pyanaconda/kickstart.py                    |  2 +-
 pyanaconda/network.py                      | 13 +------------
 pyanaconda/packaging/yumpayload.py         |  8 ++++----
 pyanaconda/ui/gui/spokes/datetime_spoke.py |  5 +++--
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/anaconda b/anaconda
index d0dd05e..0f733a5 100755
--- a/anaconda
+++ b/anaconda
@@ -408,7 +408,7 @@ def setupDisplay(anaconda, opts, addon_paths=None):
     from pyanaconda.ui.tui.simpleline import App
     from pyanaconda.ui.tui.spokes.askvnc import AskVNCSpoke
     from pykickstart.constants import DISPLAY_MODE_TEXT
-    from pyanaconda import network
+    from pyanaconda.nm import nm_is_connected
     from blivet import arch
     import blivet.util
 
@@ -470,7 +470,7 @@ def setupDisplay(anaconda, opts, addon_paths=None):
         flags.vncquestion = False
 
     # disable VNC question if we don't have network
-    if not network.hasActiveNetDev():
+    if not nm_is_connected():
         flags.vncquestion = False
 
     # disable VNC question if we don't have X
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 9864a8e..d1e4c5a 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -153,7 +153,7 @@ def getEscrowCertificate(escrowCerts, url):
         return escrowCerts[url]
 
     needs_net = not url.startswith("/") and not url.startswith("file:")
-    if needs_net and not network.hasActiveNetDev():
+    if needs_net and not nm.nm_is_connected():
         msg = _("Escrow certificate %s requires the network.") % url
         raise KickstartError(msg)
 
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index ca7143b..67a0430 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -217,17 +217,6 @@ def nmIsConnected(state):
                      NM_STATE_CONNECTED_SITE,
                      NM_STATE_CONNECTED_GLOBAL)
 
-def hasActiveNetDev():
-    try:
-        bus = dbus.SystemBus()
-        nm = bus.get_object(NM_SERVICE, NM_MANAGER_PATH)
-        props = dbus.Interface(nm, DBUS_PROPS_IFACE)
-        state = props.Get(NM_SERVICE, "State")
-
-        return nmIsConnected(state)
-    except:
-        return flags.testing
-
 def logIfcfgFile(path, message=""):
     content = ""
     if os.access(path, os.R_OK):
@@ -841,7 +830,7 @@ def get_device_name(devspec):
         if "ksdevice" in flags.cmdline:
             msg = "ksdevice boot parameter"
             devname = get_ksdevice_name(flags.cmdline["ksdevice"])
-        elif hasActiveNetDev():
+        elif nm.nm_is_connected():
             # device activated in stage 1 by network kickstart command
             msg = "first active device"
             devname = nm.nm_activated_devices()[0]
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 9fe60ad..370154d 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -72,7 +72,7 @@ from pyanaconda.flags import flags
 
 from pyanaconda import iutil
 from pyanaconda.iutil import ProxyString, ProxyStringError
-from pyanaconda.network import hasActiveNetDev
+from pyanaconda.nm import nm_is_connected
 from blivet.size import Size
 import blivet.util
 import blivet.arch
@@ -723,7 +723,7 @@ reposdir=%s
 
             url = "file://" + mountpoint
 
-        if self._repoNeedsNetwork(repo) and not hasActiveNetDev():
+        if self._repoNeedsNetwork(repo) and not nm_is_connected():
             raise NoNetworkError
 
         proxy = repo.proxy or self.data.method.proxy
@@ -966,7 +966,7 @@ reposdir=%s
         from yum.Errors import RepoError, GroupsError
         with _yum_lock:
             if not self._groups:
-                if not self.needsNetwork or hasActiveNetDev():
+                if not self.needsNetwork or nm_is_connected():
                     try:
                         self._groups = self._yum.comps
                     except (RepoError, GroupsError) as e:
@@ -1078,7 +1078,7 @@ reposdir=%s
 
         with _yum_lock:
             if not self._packages:
-                if self.needsNetwork and not hasActiveNetDev():
+                if self.needsNetwork and not nm_is_connected():
                     raise NoNetworkError
 
                 try:
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index b9b59bb..8458f1e 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -37,6 +37,7 @@ from pyanaconda.ui.gui.utils import enlightbox, gtk_thread_nowait, gtk_call_once
 from pyanaconda import timezone
 from pyanaconda import iutil
 from pyanaconda import network
+from pyanaconda import nm
 from pyanaconda import ntp
 from pyanaconda import flags
 from pyanaconda.threads import threadMgr, AnacondaThread
@@ -441,7 +442,7 @@ class DatetimeSpoke(NormalSpoke):
 
         self._update_datetime()
 
-        has_active_network = network.hasActiveNetDev()
+        has_active_network = nm.nm_is_connected()
         if not has_active_network:
             self._show_no_network_warning()
         else:
@@ -827,7 +828,7 @@ class DatetimeSpoke(NormalSpoke):
                 #cannot touch runtime system, not much to do here
                 return
 
-            if not network.hasActiveNetDev():
+            if not nm.nm_is_connected():
                 self._show_no_network_warning()
                 switch.set_active(False)
                 return
-- 
1.7.11.7



More information about the anaconda-patches mailing list