auto-t: update tests to use get_ordered_network call

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')

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')

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 = device.get_ordered_network('TestAPRoam')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "TestAPRoam")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'

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()
+        ordered_network = device.get_ordered_network('ssidOpen')
-        o_net = ordered_networks[0]
 
-        o_net.network_object.connect()
+        ordered_network.network_object.connect()
 
         condition = 'obj.state == DeviceState.connected'
         wd.wait_for_object_condition(device, condition)

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 = device.get_ordered_network('ssidEAP-AKA')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-AKA")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-AKA')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-AKA")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-AKA')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-AKA")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-AKA')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-AKA")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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
+        ordered_network = device.get_ordered_network(ssid)
-        for ordered_network in device.get_ordered_networks():
+
-            if ordered_network.name == ssid:
+        self.assertEqual(ordered_network.type, NetworkType.eap)
-                network = ordered_network
-                break
-        self.assertEqual(network.type, NetworkType.eap)
 
         condition = 'not obj.connected'
         wd.wait_for_object_condition(ordered_network.network_object, condition)

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 = device.get_ordered_network('ssidEAP-PEAPv1-GTC-nosecret')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, 'ssidEAP-PEAPv1-GTC-nosecret')
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-PEAPv1-GTC')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, 'ssidEAP-PEAPv1-GTC')
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-PEAP-MSCHAPv2')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-PEAP-MSCHAPv2")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-PEAP-SIM')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-PEAP-SIM")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-PEAP-frag')
-        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)
 
         self.assertEqual(ordered_network.type, NetworkType.eap)
 

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 = device.get_ordered_network('ssidEAP-PEAPv0')
-        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)
 
         self.assertEqual(ordered_network.type, NetworkType.eap)
 

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 = device.get_ordered_network('ssidEAP-PEAPv1')
-        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)
 
         self.assertEqual(ordered_network.type, NetworkType.eap)
 

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 = device.get_ordered_network('ssidEAP-PWD')
-        ordered_network = None
 
-        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'

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 = device.get_ordered_network('ssidEAP-PWD-frag')
-        ordered_network = None
 
-        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'

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 = device.get_ordered_network('ssidEAP-SIM')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-SIM")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-SIM')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-SIM")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TLS')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TLS")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network(ssid)
-        ordered_network = [n for n in ordered_networks if n.name == ssid][0]
 
         self.assertEqual(ordered_network.type, NetworkType.eap)
 

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 = device.get_ordered_network('ssidEAP-TLS')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TLS")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TLS')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TLS")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TTLS-CHAP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TTLS-CHAP")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TTLS')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TTLS")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TTLS')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TTLS")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TTLS-MSCHAP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TTLS-MSCHAP")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TTLS-PAP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TTLS-PAP")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidEAP-TTLS')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidEAP-TTLS")
         self.assertEqual(ordered_network.type, NetworkType.eap)
 
         condition = 'not obj.connected'

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)
 

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)
 

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)
 

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()

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 = device.get_ordered_network('ssidNew')
-        ordered_network = ordered_networks[0]
-
-        self.assertEqual(ordered_network.name, "ssidNew")
 
         condition = 'not obj.connected'
         wd.wait_for_object_condition(ordered_network.network_object, condition)

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 = device.get_ordered_network(ssid)
-        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)
 
         condition = 'not obj.connected'
         wd.wait_for_object_condition(ordered_network.network_object, condition)

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 = device.get_ordered_network('ssidOWE')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidOWE")
         self.assertEqual(ordered_network.type, NetworkType.open)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidOpen')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidOpen")
         self.assertEqual(ordered_network.type, NetworkType.open)
 
         condition = 'not obj.connected'

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)
 

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)
 

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.assertEqual(ordered_network.type, NetworkType.psk)
-
-        self.assertIsNotNone(network)
-        self.assertEqual(network.name, "ssidSAE")
-        self.assertEqual(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
 

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)

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'

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'

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 = device.get_ordered_network('ssidCCMP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidCCMP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidCCMP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidCCMP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidTKIP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidTKIP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidCCMP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidCCMP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidCCMP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidCCMP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidCCMP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidCCMP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'

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 = device.get_ordered_network('ssidCCMP')
-        ordered_network = ordered_networks[0]
 
-        self.assertEqual(ordered_network.name, "ssidCCMP")
         self.assertEqual(ordered_network.type, NetworkType.psk)
 
         condition = 'not obj.connected'