From 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:01:41 +0100 Subject: New upstream version 1.14.6 --- tools/test-networkmanager-service.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'tools/test-networkmanager-service.py') diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 8a37fb17..9aa44a90 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -916,16 +916,8 @@ class WifiDevice(Device): self.aps = [] self.scan_cb_id = None - # Note: we would like to simulate how nmcli calls RequestScan() and we could - # do so by using an older timestamp. However, that makes the client tests - # racy, because if a bunch of nmcli instances run in parallel against this - # service, earlier instances will issue a RequestScan(), while later instances - # won't do that (because the LastScan timestamp is already updated). That means, - # the later instances will print the scan result immediately, and in another sort - # order. That should be fixed, by nmcli not starting to print anything, before - # all RequestScan() requests complete, and thus, always print a consistent list - # of results. - ts = NM.utils_get_timestamp_msec() + # Use a randomly older timestamp to trigger RequestScan() from the client + ts = max(0, NM.utils_get_timestamp_msec() - Util.random_int(self.path, 20000, 40000)) props = { PRP_WIFI_HW_ADDRESS: mac, -- cgit 1.3.0-6-gf8a5 From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:25:23 +0100 Subject: New upstream version 1.16.0 --- tools/test-networkmanager-service.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'tools/test-networkmanager-service.py') diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 9aa44a90..2fec2e26 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -296,7 +296,7 @@ class Util: if val.signature == 'y': return GLib.Variant('ay', [int(x) for x in val]) if val.signature == 'u': - return GLib.Variant('au', [Util.variant_from_dbus(x) for x in val]) + return GLib.Variant('au', [int(x) for x in val]) if val.signature == 'ay': return GLib.Variant('aay', [Util.variant_from_dbus(x) for x in val]) if val.signature == 'au': @@ -861,12 +861,23 @@ class WifiAp(ExportedObj): ExportedObj.__init__(self, ExportedObj.create_path(WifiAp), ident) + NM_AP_FLAGS = getattr(NM, '80211ApSecurityFlags') if flags is None: flags = 0x1 if wpaf is None: - wpaf = 0x1cc + wpaf = 0x0 + wpaf = wpaf | NM_AP_FLAGS.PAIR_TKIP + wpaf = wpaf | NM_AP_FLAGS.PAIR_CCMP + wpaf = wpaf | NM_AP_FLAGS.GROUP_TKIP + wpaf = wpaf | NM_AP_FLAGS.GROUP_CCMP + wpaf = wpaf | NM_AP_FLAGS.KEY_MGMT_PSK if rsnf is None: - rsnf = 0x1cc + rsnf = 0x0 + rsnf = rsnf | NM_AP_FLAGS.PAIR_TKIP + rsnf = rsnf | NM_AP_FLAGS.PAIR_CCMP + rsnf = rsnf | NM_AP_FLAGS.GROUP_TKIP + rsnf = rsnf | NM_AP_FLAGS.GROUP_CCMP + rsnf = rsnf | NM_AP_FLAGS.KEY_MGMT_PSK if freq is None: freq = 2412 if bssid is None: @@ -1341,9 +1352,14 @@ class NetworkManager(ExportedObj): @dbus.service.method(dbus_interface=IFACE_NM, in_signature='a{sa{sv}}oo', out_signature='oo') def AddAndActivateConnection(self, con_hash, devpath, specific_object): + conpath, acpath, result = self.AddAndActivateConnection2(con_hash, devpath, specific_object, dict()) + return (conpath, acpath) + + @dbus.service.method(dbus_interface=IFACE_NM, in_signature='a{sa{sv}}ooa{sv}', out_signature='ooa{sv}') + def AddAndActivateConnection2(self, con_hash, devpath, specific_object, options): device = self.find_device_first(path = devpath, require = BusErr.UnknownDeviceException) conpath = gl.settings.AddConnection(con_hash) - return (conpath, self.ActivateConnection(conpath, devpath, specific_object)) + return (conpath, self.ActivateConnection(conpath, devpath, specific_object), []) @dbus.service.method(dbus_interface=IFACE_NM, in_signature='o', out_signature='') def DeactivateConnection(self, active_connection): -- cgit 1.3.0-6-gf8a5 From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- tools/test-networkmanager-service.py | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) (limited to 'tools/test-networkmanager-service.py') diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 2fec2e26..c2d874f3 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -687,6 +687,7 @@ PRP_DEVICE_MANAGED = "Managed" PRP_DEVICE_AUTOCONNECT = "Autoconnect" PRP_DEVICE_DEVICE_TYPE = "DeviceType" PRP_DEVICE_AVAILABLE_CONNECTIONS = "AvailableConnections" +PRP_DEVICE_LLDP_NEIGHBORS = "LldpNeighbors" class Device(ExportedObj): @@ -719,6 +720,87 @@ class Device(ExportedObj): PRP_DEVICE_AUTOCONNECT: True, PRP_DEVICE_DEVICE_TYPE: dbus.UInt32(devtype), PRP_DEVICE_AVAILABLE_CONNECTIONS: ExportedObj.to_path_array([]), + PRP_DEVICE_LLDP_NEIGHBORS: dbus.Array([ + dbus.Dictionary({ + 'chassis-id-type': dbus.UInt32(6), + 'chassis-id': dbus.String('00:11:22:33:44:00'), + 'port-id-type': dbus.UInt32(7), + 'port-id': dbus.String('Uplink port'), + 'port-description': dbus.String('GigabitEthernet #1'), + 'system-name': dbus.String('test1.example.com'), + 'system-description': dbus.String('Test system #1'), + 'system-capabilities': dbus.UInt32(20), + 'destination': dbus.String('nearest-bridge'), + }), + dbus.Dictionary({ + 'chassis-id-type': dbus.UInt32(2), + 'chassis-id': dbus.String('chassis1'), + 'port-id-type': dbus.UInt32(3), + 'port-id': dbus.String('44:44:44:44:44:44'), + 'port-description': dbus.String('GigabitEthernet #2'), + 'system-name': dbus.String('test2.example.com'), + 'system-description': dbus.String('Test system #2'), + 'system-capabilities': dbus.UInt32(2047), + 'destination': dbus.String('nearest-non-tpmr-bridge'), + 'ieee-802-1-vlans': dbus.Array([ + dbus.Dictionary({ + 'vid': dbus.UInt32(80), + 'name': dbus.String('vlan80'), + }, signature = 'sv'), + dbus.Dictionary({ + 'vid': dbus.UInt32(4000), + 'name': dbus.String('My VLAN'), + }, signature = 'sv'), + ]), + 'ieee-802-1-ppvids': dbus.Array([ + dbus.Dictionary({ + 'ppvid': dbus.UInt32(4), + 'flags': dbus.UInt32(0x12), + }, signature = 'sv'), + dbus.Dictionary({ + 'ppvid': dbus.UInt32(10), + 'flags': dbus.UInt32(0x31), + }, signature = 'sv'), + ]), + + }), + dbus.Dictionary({ + 'chassis-id-type': dbus.UInt32(6), + 'chassis-id': dbus.String('00:11:22:33:44:22'), + 'port-id-type': dbus.UInt32(1), + 'port-id': dbus.String('port1'), + 'port-description': dbus.String('GigabitEthernet #3'), + 'system-name': dbus.String('test3.example.com'), + 'system-description': dbus.String('Test system #3'), + 'system-capabilities': dbus.UInt32(40), + 'destination': dbus.String('nearest-customer-bridge'), + 'management-addresses': dbus.Array([ + dbus.Dictionary({ + 'address-subtype': dbus.UInt32(1), + 'address': dbus.ByteArray(b'\xc0\xa8\x01\x01'), + 'interface-number': dbus.UInt32(4), + 'interface-number-subtype': dbus.UInt32(3), + 'object-id': dbus.ByteArray(b'\x01\x02\x03\x04') + }, signature = 'sv'), + dbus.Dictionary({ + 'address-subtype': dbus.UInt32(2), + 'address': dbus.ByteArray(b'\xfd\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x12\x34\x56\x78'), + 'interface-number': dbus.UInt32(1), + 'interface-number-subtype': dbus.UInt32(2), + }, signature = 'sv'), + ]), + 'ieee-802-3-mac-phy-conf': dbus.Dictionary({ + 'autoneg': dbus.UInt32(3), + 'pmd-autoneg-cap': dbus.UInt32(0xfe), + 'operational-mau-type': dbus.UInt32(5), + }, signature = 'sv'), + 'ieee-802-3-power-via-mdi': dbus.Dictionary({ + 'mdi-power-support': dbus.UInt32(7), + 'pse-power-pair': dbus.UInt32(6), + 'power-class': dbus.UInt32(1), + }, signature = 'sv'), + }) + ], 'a{sv}') } self.dbus_interface_add(IFACE_DEVICE, props, Device.PropertiesChanged) -- cgit 1.3.0-6-gf8a5