diff --git a/autotests/testAP/failure_test.py b/autotests/testAP/failure_test.py index ca28e5f1..8c7a9568 100644 --- a/autotests/testAP/failure_test.py +++ b/autotests/testAP/failure_test.py @@ -24,16 +24,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(dev, condition) - ordered_networks = dev.get_ordered_networks() + ordered_network = dev.get_ordered_network('TestAP1') - ordered_network = None - for network in ordered_networks: - if network.name == 'TestAP1': - ordered_network = network - break - - self.assertNotEqual(ordered_network, None) - self.assertEqual(ordered_network.name, 'TestAP1') self.assertEqual(ordered_network.type, NetworkType.psk) psk_agent = PSKAgent('Password1') diff --git a/autotests/testAP/test.py b/autotests/testAP/test.py index 6c4ffce2..a1b62a5a 100644 --- a/autotests/testAP/test.py +++ b/autotests/testAP/test.py @@ -24,16 +24,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(dev, condition) - ordered_networks = dev.get_ordered_networks() + ordered_network = dev.get_ordered_network('TestAP1') - ordered_network = None - for network in ordered_networks: - if network.name == 'TestAP1': - ordered_network = network - break - - self.assertNotEqual(ordered_network, None) - self.assertEqual(ordered_network.name, 'TestAP1') self.assertEqual(ordered_network.type, NetworkType.psk) psk_agent = PSKAgent('Password1') diff --git a/autotests/testAPRoam/connection_test.py b/autotests/testAPRoam/connection_test.py index 8e832528..02f57f38 100644 --- a/autotests/testAPRoam/connection_test.py +++ b/autotests/testAPRoam/connection_test.py @@ -59,10 +59,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('TestAPRoam') - self.assertEqual(ordered_network.name, "TestAPRoam") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testDisconnectByAP/disconnect_by_ap_test.py b/autotests/testDisconnectByAP/disconnect_by_ap_test.py index 9df11f7c..298d75c4 100644 --- a/autotests/testDisconnectByAP/disconnect_by_ap_test.py +++ b/autotests/testDisconnectByAP/disconnect_by_ap_test.py @@ -28,10 +28,9 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - o_net = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidOpen') - o_net.network_object.connect() + ordered_network.network_object.connect() condition = 'obj.state == DeviceState.connected' wd.wait_for_object_condition(device, condition) diff --git a/autotests/testEAP-AKA-ofono/connection_test.py b/autotests/testEAP-AKA-ofono/connection_test.py index fd9aeec2..94066f76 100644 --- a/autotests/testEAP-AKA-ofono/connection_test.py +++ b/autotests/testEAP-AKA-ofono/connection_test.py @@ -32,10 +32,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-AKA') - self.assertEqual(ordered_network.name, "ssidEAP-AKA") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-AKA-prime-ofono/connection_test.py b/autotests/testEAP-AKA-prime-ofono/connection_test.py index 022f1a4b..2ff99894 100644 --- a/autotests/testEAP-AKA-prime-ofono/connection_test.py +++ b/autotests/testEAP-AKA-prime-ofono/connection_test.py @@ -32,10 +32,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-AKA') - self.assertEqual(ordered_network.name, "ssidEAP-AKA") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-AKA-prime/connection_test.py b/autotests/testEAP-AKA-prime/connection_test.py index b5ce22fc..3c5714ee 100644 --- a/autotests/testEAP-AKA-prime/connection_test.py +++ b/autotests/testEAP-AKA-prime/connection_test.py @@ -27,10 +27,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-AKA') - self.assertEqual(ordered_network.name, "ssidEAP-AKA") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-AKA/connection_test.py b/autotests/testEAP-AKA/connection_test.py index a1dc613e..734e0dbb 100644 --- a/autotests/testEAP-AKA/connection_test.py +++ b/autotests/testEAP-AKA/connection_test.py @@ -40,10 +40,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-AKA') - self.assertEqual(ordered_network.name, "ssidEAP-AKA") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-MSCHAPV2/connection_test.py b/autotests/testEAP-MSCHAPV2/connection_test.py index 1e826eeb..d38f4b09 100644 --- a/autotests/testEAP-MSCHAPV2/connection_test.py +++ b/autotests/testEAP-MSCHAPV2/connection_test.py @@ -34,12 +34,9 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - network = None - for ordered_network in device.get_ordered_networks(): - if ordered_network.name == ssid: - network = ordered_network - break - self.assertEqual(network.type, NetworkType.eap) + ordered_network = device.get_ordered_network(ssid) + + self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' wd.wait_for_object_condition(ordered_network.network_object, condition) diff --git a/autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py b/autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py index de38d1fb..a7f0cbf1 100644 --- a/autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py +++ b/autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py @@ -26,10 +26,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-PEAPv1-GTC-nosecret') - self.assertEqual(ordered_network.name, 'ssidEAP-PEAPv1-GTC-nosecret') self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-PEAP-GTC/peap_gtc_test.py b/autotests/testEAP-PEAP-GTC/peap_gtc_test.py index 54b9f179..d3754d94 100644 --- a/autotests/testEAP-PEAP-GTC/peap_gtc_test.py +++ b/autotests/testEAP-PEAP-GTC/peap_gtc_test.py @@ -25,10 +25,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-PEAPv1-GTC') - self.assertEqual(ordered_network.name, 'ssidEAP-PEAPv1-GTC') self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-PEAP-MSCHAPv2/connection_test.py b/autotests/testEAP-PEAP-MSCHAPv2/connection_test.py index e499f6ed..75f858ad 100644 --- a/autotests/testEAP-PEAP-MSCHAPv2/connection_test.py +++ b/autotests/testEAP-PEAP-MSCHAPv2/connection_test.py @@ -25,10 +25,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-PEAP-MSCHAPv2') - self.assertEqual(ordered_network.name, "ssidEAP-PEAP-MSCHAPv2") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-PEAP-SIM/connection_test.py b/autotests/testEAP-PEAP-SIM/connection_test.py index 97e94a8c..78435435 100644 --- a/autotests/testEAP-PEAP-SIM/connection_test.py +++ b/autotests/testEAP-PEAP-SIM/connection_test.py @@ -24,10 +24,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-PEAP-SIM') - self.assertEqual(ordered_network.name, "ssidEAP-PEAP-SIM") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-PEAP/peap_frag_test.py b/autotests/testEAP-PEAP/peap_frag_test.py index fa007db3..f1793ca1 100644 --- a/autotests/testEAP-PEAP/peap_frag_test.py +++ b/autotests/testEAP-PEAP/peap_frag_test.py @@ -12,8 +12,6 @@ from iwd import NetworkType class Test(unittest.TestCase): def validate_connection(self, wd): - ssid_to_connect = 'ssidEAP-PEAP-frag' - devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] @@ -26,15 +24,7 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = None - - for o_n in ordered_networks: - if o_n.name == ssid_to_connect: - ordered_network = o_n - break - - self.assertEqual(ordered_network.name, ssid_to_connect) + ordered_network = device.get_ordered_network('ssidEAP-PEAP-frag') self.assertEqual(ordered_network.type, NetworkType.eap) diff --git a/autotests/testEAP-PEAP/peap_v0_test.py b/autotests/testEAP-PEAP/peap_v0_test.py index 0d539ec4..54d5803b 100644 --- a/autotests/testEAP-PEAP/peap_v0_test.py +++ b/autotests/testEAP-PEAP/peap_v0_test.py @@ -12,8 +12,6 @@ from iwd import NetworkType class Test(unittest.TestCase): def validate_connection(self, wd): - ssid_to_connect = 'ssidEAP-PEAPv0' - devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] @@ -26,15 +24,7 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = None - - for o_n in ordered_networks: - if o_n.name == ssid_to_connect: - ordered_network = o_n - break - - self.assertEqual(ordered_network.name, ssid_to_connect) + ordered_network = device.get_ordered_network('ssidEAP-PEAPv0') self.assertEqual(ordered_network.type, NetworkType.eap) diff --git a/autotests/testEAP-PEAP/peap_v1_test.py b/autotests/testEAP-PEAP/peap_v1_test.py index bab0661d..b0670341 100644 --- a/autotests/testEAP-PEAP/peap_v1_test.py +++ b/autotests/testEAP-PEAP/peap_v1_test.py @@ -12,8 +12,6 @@ from iwd import NetworkType class Test(unittest.TestCase): def validate_connection(self, wd): - ssid_to_connect = 'ssidEAP-PEAPv1' - devices = wd.list_devices(1) self.assertIsNotNone(devices) device = devices[0] @@ -26,15 +24,7 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = None - - for o_n in ordered_networks: - if o_n.name == ssid_to_connect: - ordered_network = o_n - break - - self.assertEqual(ordered_network.name, ssid_to_connect) + ordered_network = device.get_ordered_network('ssidEAP-PEAPv1') self.assertEqual(ordered_network.type, NetworkType.eap) diff --git a/autotests/testEAP-PWD/connection_test.py b/autotests/testEAP-PWD/connection_test.py index 44a9cd27..c14b5e9f 100644 --- a/autotests/testEAP-PWD/connection_test.py +++ b/autotests/testEAP-PWD/connection_test.py @@ -42,15 +42,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = None + ordered_network = device.get_ordered_network('ssidEAP-PWD') - for o_n in ordered_networks: - if o_n.name == "ssidEAP-PWD": - ordered_network = o_n - break - - self.assertEqual(ordered_network.name, "ssidEAP-PWD") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-PWD/frag_test.py b/autotests/testEAP-PWD/frag_test.py index ddccac89..55162da6 100644 --- a/autotests/testEAP-PWD/frag_test.py +++ b/autotests/testEAP-PWD/frag_test.py @@ -23,15 +23,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = None + ordered_network = device.get_ordered_network('ssidEAP-PWD-frag') - for o_n in ordered_networks: - if o_n.name == 'ssidEAP-PWD-frag': - ordered_network = o_n - break - - self.assertEqual(ordered_network.name, 'ssidEAP-PWD-frag') self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-SIM-ofono/connection_test.py b/autotests/testEAP-SIM-ofono/connection_test.py index 5cc39b6b..95242943 100644 --- a/autotests/testEAP-SIM-ofono/connection_test.py +++ b/autotests/testEAP-SIM-ofono/connection_test.py @@ -32,10 +32,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-SIM') - self.assertEqual(ordered_network.name, "ssidEAP-SIM") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-SIM/connection_test.py b/autotests/testEAP-SIM/connection_test.py index 8274abc0..0ac7da05 100644 --- a/autotests/testEAP-SIM/connection_test.py +++ b/autotests/testEAP-SIM/connection_test.py @@ -38,10 +38,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-SIM') - self.assertEqual(ordered_network.name, "ssidEAP-SIM") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TLS-Frag/connection_test.py b/autotests/testEAP-TLS-Frag/connection_test.py index 124eb339..069250cf 100644 --- a/autotests/testEAP-TLS-Frag/connection_test.py +++ b/autotests/testEAP-TLS-Frag/connection_test.py @@ -24,10 +24,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TLS') - self.assertEqual(ordered_network.name, "ssidEAP-TLS") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TLS/connection_test.py b/autotests/testEAP-TLS/connection_test.py index cfcfdc64..96058f37 100644 --- a/autotests/testEAP-TLS/connection_test.py +++ b/autotests/testEAP-TLS/connection_test.py @@ -39,8 +39,7 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = [n for n in ordered_networks if n.name == ssid][0] + ordered_network = device.get_ordered_network(ssid) self.assertEqual(ordered_network.type, NetworkType.eap) diff --git a/autotests/testEAP-TLSwithMFPC/connection_test.py b/autotests/testEAP-TLSwithMFPC/connection_test.py index 124eb339..069250cf 100644 --- a/autotests/testEAP-TLSwithMFPC/connection_test.py +++ b/autotests/testEAP-TLSwithMFPC/connection_test.py @@ -24,10 +24,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TLS') - self.assertEqual(ordered_network.name, "ssidEAP-TLS") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TLSwithMFPR/connection_test.py b/autotests/testEAP-TLSwithMFPR/connection_test.py index 124eb339..069250cf 100644 --- a/autotests/testEAP-TLSwithMFPR/connection_test.py +++ b/autotests/testEAP-TLSwithMFPR/connection_test.py @@ -24,10 +24,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TLS') - self.assertEqual(ordered_network.name, "ssidEAP-TLS") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TTLS-CHAP/connection_test.py b/autotests/testEAP-TTLS-CHAP/connection_test.py index 60e8d69e..f9633b28 100644 --- a/autotests/testEAP-TTLS-CHAP/connection_test.py +++ b/autotests/testEAP-TTLS-CHAP/connection_test.py @@ -41,10 +41,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TTLS-CHAP') - self.assertEqual(ordered_network.name, "ssidEAP-TTLS-CHAP") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py b/autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py index d39862f4..23c839b1 100644 --- a/autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py +++ b/autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py @@ -31,10 +31,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TTLS') - self.assertEqual(ordered_network.name, "ssidEAP-TTLS") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TTLS-Frag/connection_test.py b/autotests/testEAP-TTLS-Frag/connection_test.py index e9b53a48..832a0b93 100644 --- a/autotests/testEAP-TTLS-Frag/connection_test.py +++ b/autotests/testEAP-TTLS-Frag/connection_test.py @@ -24,10 +24,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TTLS') - self.assertEqual(ordered_network.name, "ssidEAP-TTLS") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TTLS-MSCHAP/connection_test.py b/autotests/testEAP-TTLS-MSCHAP/connection_test.py index 3b51a547..ff2b9feb 100644 --- a/autotests/testEAP-TTLS-MSCHAP/connection_test.py +++ b/autotests/testEAP-TTLS-MSCHAP/connection_test.py @@ -41,10 +41,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TTLS-MSCHAP') - self.assertEqual(ordered_network.name, "ssidEAP-TTLS-MSCHAP") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TTLS-PAP/connection_test.py b/autotests/testEAP-TTLS-PAP/connection_test.py index 9a03e9d2..07b14aa9 100644 --- a/autotests/testEAP-TTLS-PAP/connection_test.py +++ b/autotests/testEAP-TTLS-PAP/connection_test.py @@ -41,10 +41,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TTLS-PAP') - self.assertEqual(ordered_network.name, "ssidEAP-TTLS-PAP") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testEAP-TTLS/connection_test.py b/autotests/testEAP-TTLS/connection_test.py index 1189309e..fa7d1e55 100644 --- a/autotests/testEAP-TTLS/connection_test.py +++ b/autotests/testEAP-TTLS/connection_test.py @@ -25,10 +25,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidEAP-TTLS') - self.assertEqual(ordered_network.name, "ssidEAP-TTLS") self.assertEqual(ordered_network.type, NetworkType.eap) condition = 'not obj.connected' diff --git a/autotests/testFT-8021x-roam/test.py b/autotests/testFT-8021x-roam/test.py index b7948b03..f2480f41 100644 --- a/autotests/testFT-8021x-roam/test.py +++ b/autotests/testFT-8021x-roam/test.py @@ -43,11 +43,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + ordered_network = device.get_ordered_network('TestFT') - self.assertEqual(len(ordered_networks), 1) - ordered_network = ordered_networks[0] - self.assertEqual(ordered_network.name, "TestFT") self.assertEqual(ordered_network.type, NetworkType.eap) self.assertEqual(ordered_network.signal_strength, -2000) diff --git a/autotests/testFT-PSK-roam/test.py b/autotests/testFT-PSK-roam/test.py index d420963b..d079e20d 100644 --- a/autotests/testFT-PSK-roam/test.py +++ b/autotests/testFT-PSK-roam/test.py @@ -47,11 +47,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + ordered_network = device.get_ordered_network('TestFT') - self.assertEqual(len(ordered_networks), 1) - ordered_network = ordered_networks[0] - self.assertEqual(ordered_network.name, "TestFT") self.assertEqual(ordered_network.type, NetworkType.psk) self.assertEqual(ordered_network.signal_strength, -2000) diff --git a/autotests/testFT-SAE-roam/test.py b/autotests/testFT-SAE-roam/test.py index 00012d39..3174e076 100644 --- a/autotests/testFT-SAE-roam/test.py +++ b/autotests/testFT-SAE-roam/test.py @@ -52,11 +52,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + ordered_network = device.get_ordered_network('TestFT') - self.assertEqual(len(ordered_networks), 1) - ordered_network = ordered_networks[0] - self.assertEqual(ordered_network.name, "TestFT") self.assertEqual(ordered_network.type, NetworkType.psk) self.assertEqual(ordered_network.signal_strength, -2000) diff --git a/autotests/testHiddenNetworks/validation.py b/autotests/testHiddenNetworks/validation.py index afc4b392..face81f0 100644 --- a/autotests/testHiddenNetworks/validation.py +++ b/autotests/testHiddenNetworks/validation.py @@ -30,10 +30,8 @@ class TestConnectAutoconnect(unittest.TestCase): condition = 'obj.connected_network is not None' wd.wait_for_object_condition(device, condition) - ordered_network = device.get_ordered_networks()[0] + ordered_network = device.get_ordered_network(ssid) - self.assertIsNotNone(ordered_network) - self.assertEqual(ordered_network.name, ssid) self.assertTrue(ordered_network.network_object.connected) device.disconnect() diff --git a/autotests/testKnownNetworks/known_network_test.py b/autotests/testKnownNetworks/known_network_test.py index 2a75ffc6..07f55b40 100644 --- a/autotests/testKnownNetworks/known_network_test.py +++ b/autotests/testKnownNetworks/known_network_test.py @@ -22,10 +22,7 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] - - self.assertEqual(ordered_network.name, "ssidNew") + ordered_network = device.get_ordered_network('ssidNew') condition = 'not obj.connected' wd.wait_for_object_condition(ordered_network.network_object, condition) diff --git a/autotests/testMFP-Options/connection_test.py b/autotests/testMFP-Options/connection_test.py index ab57ea39..6aacd9f3 100644 --- a/autotests/testMFP-Options/connection_test.py +++ b/autotests/testMFP-Options/connection_test.py @@ -31,15 +31,7 @@ class TestMFP(unittest.TestCase): ''' def check_mfp_connection(self, wd, device, ssid, throws_exception): - ordered_networks = device.get_ordered_networks() - ordered_network = None - - for o_n in ordered_networks: - if o_n.name == ssid: - ordered_network = o_n - break - - self.assertEqual(ordered_network.name, ssid) + ordered_network = device.get_ordered_network(ssid) condition = 'not obj.connected' wd.wait_for_object_condition(ordered_network.network_object, condition) diff --git a/autotests/testOWE/connection_test.py b/autotests/testOWE/connection_test.py index 09c655e6..4820eaee 100644 --- a/autotests/testOWE/connection_test.py +++ b/autotests/testOWE/connection_test.py @@ -25,10 +25,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidOWE') - self.assertEqual(ordered_network.name, "ssidOWE") self.assertEqual(ordered_network.type, NetworkType.open) condition = 'not obj.connected' diff --git a/autotests/testOpen/connection_test.py b/autotests/testOpen/connection_test.py index e34f7874..5b0a7fe1 100644 --- a/autotests/testOpen/connection_test.py +++ b/autotests/testOpen/connection_test.py @@ -25,10 +25,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidOpen') - self.assertEqual(ordered_network.name, "ssidOpen") self.assertEqual(ordered_network.type, NetworkType.open) condition = 'not obj.connected' diff --git a/autotests/testPreauth-roam/test.py b/autotests/testPreauth-roam/test.py index b631ff70..ca295544 100644 --- a/autotests/testPreauth-roam/test.py +++ b/autotests/testPreauth-roam/test.py @@ -79,11 +79,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + ordered_network = device.get_ordered_network('TestPreauth') - self.assertEqual(len(ordered_networks), 1) - ordered_network = ordered_networks[0] - self.assertEqual(ordered_network.name, "TestPreauth") self.assertEqual(ordered_network.type, NetworkType.eap) self.assertEqual(ordered_network.signal_strength, -2500) diff --git a/autotests/testRSSIAgent/test.py b/autotests/testRSSIAgent/test.py index 86e4e61c..f8140850 100644 --- a/autotests/testRSSIAgent/test.py +++ b/autotests/testRSSIAgent/test.py @@ -41,11 +41,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + ordered_network = device.get_ordered_network('TestOpen') - self.assertEqual(len(ordered_networks), 1) - ordered_network = ordered_networks[0] - self.assertEqual(ordered_network.name, "TestOpen") self.assertEqual(ordered_network.type, NetworkType.open) self.assertEqual(ordered_network.signal_strength, -4000) diff --git a/autotests/testSAE/autoconnect_test.py b/autotests/testSAE/autoconnect_test.py index 98c0c3b3..8b0bf2b3 100644 --- a/autotests/testSAE/autoconnect_test.py +++ b/autotests/testSAE/autoconnect_test.py @@ -26,23 +26,19 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + ordered_network = device.get_ordered_network('ssidSAE') - network = [x for x in ordered_networks if x.name == "ssidSAE"][0] - - self.assertIsNotNone(network) - self.assertEqual(network.name, "ssidSAE") - self.assertEqual(network.type, NetworkType.psk) + self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'obj.connected' - wd.wait_for_object_condition(network.network_object, condition) + wd.wait_for_object_condition(ordered_network.network_object, condition) device.wait_for_connected() device.disconnect() condition = 'not obj.connected' - wd.wait_for_object_condition(network.network_object, condition) + wd.wait_for_object_condition(ordered_network.network_object, condition) del wd diff --git a/autotests/testSAE/clogging_test.py b/autotests/testSAE/clogging_test.py index 03b88940..6b64998a 100644 --- a/autotests/testSAE/clogging_test.py +++ b/autotests/testSAE/clogging_test.py @@ -33,13 +33,8 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(d, condition) for i in range(len(devices)): - ordered_networks = devices[i].get_ordered_networks() + network = devices[i].get_ordered_network('ssidSAE-Clogging') - network = [x for x in ordered_networks - if x.name == "ssidSAE-Clogging"][0] - - self.assertIsNotNone(network) - self.assertEqual(network.name, "ssidSAE-Clogging") self.assertEqual(network.type, NetworkType.psk) networks.append(network) diff --git a/autotests/testSAE/connection_test.py b/autotests/testSAE/connection_test.py index fee48960..c3ad5c94 100644 --- a/autotests/testSAE/connection_test.py +++ b/autotests/testSAE/connection_test.py @@ -37,12 +37,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + network = device.get_ordered_network('ssidSAE') - network = [x for x in ordered_networks if x.name == "ssidSAE"][0] - - self.assertIsNotNone(network) - self.assertEqual(network.name, "ssidSAE") self.assertEqual(network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testSAE/failure_test.py b/autotests/testSAE/failure_test.py index 714b9be4..9fe756e7 100644 --- a/autotests/testSAE/failure_test.py +++ b/autotests/testSAE/failure_test.py @@ -29,12 +29,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() + network = device.get_ordered_network('ssidSAE') - network = [x for x in ordered_networks if x.name == "ssidSAE"][0] - - self.assertIsNotNone(network) - self.assertEqual(network.name, "ssidSAE") self.assertEqual(network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testSAQuery-spoofing/connection_test.py b/autotests/testSAQuery-spoofing/connection_test.py index 5aa72101..506a11ca 100644 --- a/autotests/testSAQuery-spoofing/connection_test.py +++ b/autotests/testSAQuery-spoofing/connection_test.py @@ -48,10 +48,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidCCMP') - self.assertEqual(ordered_network.name, "ssidCCMP") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testSAQuery/connection_test.py b/autotests/testSAQuery/connection_test.py index 73893b8b..215d95bc 100644 --- a/autotests/testSAQuery/connection_test.py +++ b/autotests/testSAQuery/connection_test.py @@ -41,10 +41,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidCCMP') - self.assertEqual(ordered_network.name, "ssidCCMP") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testWPA/connection_test.py b/autotests/testWPA/connection_test.py index 7d5a4459..d2edde48 100644 --- a/autotests/testWPA/connection_test.py +++ b/autotests/testWPA/connection_test.py @@ -29,10 +29,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidTKIP') - self.assertEqual(ordered_network.name, "ssidTKIP") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testWPA2-SHA256/connection_test.py b/autotests/testWPA2-SHA256/connection_test.py index 2589b797..9486c716 100644 --- a/autotests/testWPA2-SHA256/connection_test.py +++ b/autotests/testWPA2-SHA256/connection_test.py @@ -28,10 +28,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidCCMP') - self.assertEqual(ordered_network.name, "ssidCCMP") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testWPA2/connection_test.py b/autotests/testWPA2/connection_test.py index 80d40cff..dcb4722e 100644 --- a/autotests/testWPA2/connection_test.py +++ b/autotests/testWPA2/connection_test.py @@ -29,10 +29,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidCCMP') - self.assertEqual(ordered_network.name, "ssidCCMP") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testWPA2/failure_test.py b/autotests/testWPA2/failure_test.py index 0004e06f..55016a92 100644 --- a/autotests/testWPA2/failure_test.py +++ b/autotests/testWPA2/failure_test.py @@ -30,10 +30,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidCCMP') - self.assertEqual(ordered_network.name, "ssidCCMP") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' diff --git a/autotests/testWPA2withMFP/connection_test.py b/autotests/testWPA2withMFP/connection_test.py index 2589b797..9486c716 100644 --- a/autotests/testWPA2withMFP/connection_test.py +++ b/autotests/testWPA2withMFP/connection_test.py @@ -28,10 +28,8 @@ class Test(unittest.TestCase): condition = 'not obj.scanning' wd.wait_for_object_condition(device, condition) - ordered_networks = device.get_ordered_networks() - ordered_network = ordered_networks[0] + ordered_network = device.get_ordered_network('ssidCCMP') - self.assertEqual(ordered_network.name, "ssidCCMP") self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected'