diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-10-22 13:45:21 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-12-11 10:21:40 -0600 |
| commit | d7743f0264a79bea67b2c37581f1784dc36ef158 (patch) | |
| tree | bce701cd895ade1d542ac93a4b38376af547b6ae | |
| parent | fef4b9492a69039cb906c6c36d77bca4b0a2335e (diff) | |
| download | NetworkManager-d7743f0264a79bea67b2c37581f1784dc36ef158.tar.gz | |
fixup! libnm/libnm-glib: add NMClient.get_all_devices() method and "all-devices" property
| -rwxr-xr-x | tools/test-networkmanager-service.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 564533895d..45498a8a76 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -636,6 +636,7 @@ class UnknownConnectionException(dbus.DBusException): _dbus_error_name = IFACE_NM + '.UnknownConnection' PM_DEVICES = 'Devices' +PM_ALL_DEVICES = 'AllDevices' PM_NETWORKING_ENABLED = 'NetworkingEnabled' PM_WWAN_ENABLED = 'WwanEnabled' PM_WWAN_HARDWARE_ENABLED = 'WwanHardwareEnabled' @@ -680,6 +681,10 @@ class NetworkManager(ExportedObj): def GetDevices(self): return self._get_dbus_properties(IFACE_NM)[PM_DEVICES] + @dbus.service.method(dbus_interface=IFACE_NM, in_signature='', out_signature='ao') + def GetAllDevices(self): + return self._get_dbus_properties(IFACE_NM)[PM_ALL_DEVICES] + @dbus.service.method(dbus_interface=IFACE_NM, in_signature='s', out_signature='o') def GetDeviceByIpIface(self, ip_iface): for d in self.devices: @@ -797,6 +802,7 @@ class NetworkManager(ExportedObj): def add_device(self, device): self.devices.append(device) self.__notify(PM_DEVICES) + self.__notify(PM_ALL_DEVICES) self.DeviceAdded(to_path(device)) @dbus.service.signal(IFACE_NM, signature='o') @@ -806,12 +812,14 @@ class NetworkManager(ExportedObj): def remove_device(self, device): self.devices.remove(device) self.__notify(PM_DEVICES) + self.__notify(PM_ALL_DEVICES) self.DeviceRemoved(to_path(device)) ################# D-Bus Properties interface def __get_props(self): props = {} props[PM_DEVICES] = to_path_array(self.devices) + props[PM_ALL_DEVICES] = to_path_array(self.devices) props[PM_NETWORKING_ENABLED] = True props[PM_WWAN_ENABLED] = True props[PM_WWAN_HARDWARE_ENABLED] = True |