From: Ondrej Lichtner <olichtne(a)redhat.com>
The function is_nm_managed_by_name now checks both if NM is running and
if the option use_nm is set to True.
I made this change so that I could delete a few lines where we check
these parameters.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Slave/NetConfigDevice.py | 8 ++------
lnst/Slave/NetTestSlave.py | 4 +---
lnst/Slave/NmConfigDevice.py | 4 +++-
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index 27f4cb3..91dce5e 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -298,9 +298,7 @@ def NetConfigDevice(netdev, config):
'''
Class dispatcher
'''
- if check_process_running("NetworkManager") and \
- lnst_config.get_option("environment", "use_nm") and \
- is_nm_managed(netdev, config):
+ if is_nm_managed(netdev, config):
return nm_type_class_mapping[netdev["type"]](netdev, config)
else:
return type_class_mapping[netdev["type"]](netdev, config)
@@ -309,9 +307,7 @@ def NetConfigDeviceType(netdev, config):
'''
Class dispatcher for classmethods
'''
- if check_process_running("NetworkManager") and \
- lnst_config.get_option("environment", "use_nm") and \
- is_nm_managed(netdev, config):
+ if is_nm_managed(netdev, config):
return nm_type_class_mapping[netdev["type"]]
else:
return type_class_mapping[netdev["type"]]
diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py
index 272cb76..4775a42 100644
--- a/lnst/Slave/NetTestSlave.py
+++ b/lnst/Slave/NetTestSlave.py
@@ -118,9 +118,7 @@ class SlaveMethods:
devs = self.get_devices_by_hwaddr(hwaddr)
for dev in devs:
- if check_process_running("NetworkManager") and \
- lnst_config.get_option("environment", "use_nm") and \
- is_nm_managed_by_name(dev["name"]):
+ if is_nm_managed_by_name(dev["name"]):
bus = dbus.SystemBus()
nm_obj = bus.get_object("org.freedesktop.NetworkManager",
"/org/freedesktop/NetworkManager")
diff --git a/lnst/Slave/NmConfigDevice.py b/lnst/Slave/NmConfigDevice.py
index bf08afd..c743ce8 100644
--- a/lnst/Slave/NmConfigDevice.py
+++ b/lnst/Slave/NmConfigDevice.py
@@ -23,6 +23,7 @@ from lnst.Slave.NetConfigCommon import get_slaves, get_option,
get_slave_option
from lnst.Common.Utils import kmod_in_use, bool_it
from lnst.Common.NetUtils import scan_netdevs
from lnst.Common.Utils import check_process_running
+from lnst.Common.Config import lnst_config
NM_BUS = "org.freedesktop.NetworkManager"
OBJ_PRE = "/org/freedesktop/NetworkManager"
@@ -34,7 +35,8 @@ _DEV_UNAVAILABLE = 20
_DEV_DISCONNECTED = 30
def is_nm_managed_by_name(dev_name):
- if not check_process_running("NetworkManager"):
+ if not check_process_running("NetworkManager") or\
+ not lnst_config.get_option("environment", "use_nm"):
return False
bus = dbus.SystemBus()
--
1.8.3.1
Show replies by date