[PATCH rhel7-branch 1/6] network: display bridge devices in status (#1075195)
Radek Vykydal
rvykydal at redhat.com
Thu Sep 25 11:30:30 UTC 2014
Resolves: rhbz#1075195
---
pyanaconda/network.py | 6 ++++++
pyanaconda/nm.py | 12 ++++++++++++
2 files changed, 18 insertions(+)
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 03d3bd9..3ec10fe 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -1295,6 +1295,10 @@ def status_message():
msg = _("Team%(interface_name)s (%(list_of_slaves)s) connected") \
% {"interface_name": devname, \
"list_of_slaves": ",".join(slaves[devname])}
+ elif nm.nm_device_type_is_bridge(devname):
+ msg = _("Bridge%(interface_name)s (%(list_of_slaves)s) connected") \
+ % {"interface_name": devname, \
+ "list_of_slaves": ",".join(slaves[devname])}
elif nm.nm_device_type_is_vlan(devname):
parent = nm.nm_device_setting_value(devname, "vlan", "parent")
vlanid = nm.nm_device_setting_value(devname, "vlan", "id")
@@ -1311,6 +1315,8 @@ def status_message():
devlist.append("%s (%s)" % (devname, ",".join(slaves[devname])))
elif nm.nm_device_type_is_team(devname):
devlist.append("%s (%s)" % (devname, ",".join(slaves[devname])))
+ elif nm.nm_device_type_is_bridge(devname):
+ devlist.append("%s (%s)" % (devname, ",".join(slaves[devname])))
elif nm.nm_device_type_is_vlan(devname):
devlist.append("%s" % devname)
msg = _("Connected: %(list_of_interface_names)s") \
diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py
index 0fca6ac..fdf2a1e 100644
--- a/pyanaconda/nm.py
+++ b/pyanaconda/nm.py
@@ -259,6 +259,18 @@ def nm_device_type_is_team(name):
"""
return nm_device_type(name) == NetworkManager.DeviceType.TEAM
+def nm_device_type_is_bridge(name):
+ """Is the type of device bridge?
+
+ :param name: name of device
+ :type name: str
+ :return: True if type of device is BRIDGE, False otherwise
+ :rtype: bool
+ :raise UnknownDeviceError: if device is not found
+ :raise PropertyNotFoundError: if property is not found
+ """
+ return nm_device_type(name) == NetworkManager.DeviceType.BRIDGE
+
def nm_device_type_is_vlan(name):
"""Is the type of device vlan?
--
1.9.3
More information about the anaconda-patches
mailing list