From ef5da3ce4b5502232fd3eec95aee38b1f740dabc Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 22 2020 08:40:42 +0000 Subject: Apply patch BZ_1901571_do_not_check_ovs_daemon_when_showing.patch patch_name: BZ_1901571_do_not_check_ovs_daemon_when_showing.patch present_in_specfile: true location_in_specfile: 12 --- diff --git a/libnmstate/nm/plugin.py b/libnmstate/nm/plugin.py index 4032359..06a5acd 100644 --- a/libnmstate/nm/plugin.py +++ b/libnmstate/nm/plugin.py @@ -97,7 +97,6 @@ class NetworkManagerPlugin(NmstatePlugin): def get_interfaces(self): info = [] - capabilities = self.capabilities devices_info = [ (dev, nm_device.get_device_common_info(dev)) @@ -123,18 +122,15 @@ class NetworkManagerPlugin(NmstatePlugin): if nm_bond.is_bond_type_id(type_id): bondinfo = nm_bond.get_bond_info(dev) iface_info.update(_ifaceinfo_bond(bondinfo)) - elif NmstatePlugin.OVS_CAPABILITY in capabilities: - if nm_ovs.is_ovs_bridge_type_id(type_id): - iface_info["bridge"] = nm_ovs.get_ovs_info( - self.context, dev, devices_info - ) - iface_info = _remove_ovs_bridge_unsupported_entries( - iface_info - ) - elif nm_ovs.is_ovs_interface_type_id(type_id): - iface_info.update(nm_ovs.get_interface_info(act_con)) - elif nm_ovs.is_ovs_port_type_id(type_id): - continue + elif nm_ovs.is_ovs_bridge_type_id(type_id): + iface_info["bridge"] = nm_ovs.get_ovs_info( + self.context, dev, devices_info + ) + iface_info = _remove_ovs_bridge_unsupported_entries(iface_info) + elif nm_ovs.is_ovs_interface_type_id(type_id): + iface_info.update(nm_ovs.get_interface_info(act_con)) + elif nm_ovs.is_ovs_port_type_id(type_id): + continue info.append(iface_info)