tests: Pass wpas/hapd instance to test_connectivity()

[thirdparty/hostap.git] / tests / hwsim / test_ap_qosmap.py

diff --git a/tests/hwsim/test_ap_qosmap.py b/tests/hwsim/test_ap_qosmap.py
index fa98b209eba3952902a152e4d22aaf42e873dc8f..b0dfef31980ccc2c63de682956577f6b3626f9f2 100644 (file)
--- a/tests/hwsim/test_ap_qosmap.py
+++ b/tests/hwsim/test_ap_qosmap.py
@@ -13,14 +13,14 @@ import hwsim_utils
 import hostapd
 from wlantest import Wlantest
 
-def check_qos_map(ap, dev, dscp, tid, ap_tid=None):
+def check_qos_map(ap, hapd, dev, dscp, tid, ap_tid=None):
     if not ap_tid:
         ap_tid = tid
     bssid = ap['bssid']
     sta = dev.p2p_interface_addr()
     wt = Wlantest()
     wt.clear_sta_counters(bssid, sta)
-    hwsim_utils.test_connectivity(dev.ifname, ap['ifname'], dscp=dscp)
+    hwsim_utils.test_connectivity(dev, hapd, dscp=dscp)
     time.sleep(0.02)
     [ tx, rx ] = wt.get_tid_counters(bssid, sta)
     if tx[tid] == 0:
@@ -38,41 +38,40 @@ def test_ap_qosmap(dev, apdev):
     ssid = "test-qosmap"
     params = { "ssid": ssid }
     params['qos_map_set'] = '53,2,22,6,8,15,0,7,255,255,16,31,32,39,255,255,40,47,48,55'
-    hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.add_ap(apdev[0]['ifname'], params)
     dev[0].connect(ssid, key_mgmt="NONE", scan_freq="2412")
     time.sleep(0.1)
-    check_qos_map(apdev[0], dev[0], 53, 2)
-    check_qos_map(apdev[0], dev[0], 22, 6)
-    check_qos_map(apdev[0], dev[0], 8, 0)
-    check_qos_map(apdev[0], dev[0], 15, 0)
-    check_qos_map(apdev[0], dev[0], 0, 1)
-    check_qos_map(apdev[0], dev[0], 7, 1)
-    check_qos_map(apdev[0], dev[0], 16, 3)
-    check_qos_map(apdev[0], dev[0], 31, 3)
-    check_qos_map(apdev[0], dev[0], 32, 4)
-    check_qos_map(apdev[0], dev[0], 39, 4)
-    check_qos_map(apdev[0], dev[0], 40, 6)
-    check_qos_map(apdev[0], dev[0], 47, 6)
-    check_qos_map(apdev[0], dev[0], 48, 7)
-    check_qos_map(apdev[0], dev[0], 55, 7)
-    hapd = hostapd.Hostapd(apdev[0]['ifname'])
+    check_qos_map(apdev[0], hapd, dev[0], 53, 2)
+    check_qos_map(apdev[0], hapd, dev[0], 22, 6)
+    check_qos_map(apdev[0], hapd, dev[0], 8, 0)
+    check_qos_map(apdev[0], hapd, dev[0], 15, 0)
+    check_qos_map(apdev[0], hapd, dev[0], 0, 1)
+    check_qos_map(apdev[0], hapd, dev[0], 7, 1)
+    check_qos_map(apdev[0], hapd, dev[0], 16, 3)
+    check_qos_map(apdev[0], hapd, dev[0], 31, 3)
+    check_qos_map(apdev[0], hapd, dev[0], 32, 4)
+    check_qos_map(apdev[0], hapd, dev[0], 39, 4)
+    check_qos_map(apdev[0], hapd, dev[0], 40, 6)
+    check_qos_map(apdev[0], hapd, dev[0], 47, 6)
+    check_qos_map(apdev[0], hapd, dev[0], 48, 7)
+    check_qos_map(apdev[0], hapd, dev[0], 55, 7)
     hapd.request("SET_QOS_MAP_SET 22,6,8,15,0,7,255,255,16,31,32,39,255,255,40,47,48,55")
     hapd.request("SEND_QOS_MAP_CONF " + dev[0].get_status_field("address"))
-    check_qos_map(apdev[0], dev[0], 53, 7)
-    check_qos_map(apdev[0], dev[0], 22, 6)
-    check_qos_map(apdev[0], dev[0], 48, 7)
-    check_qos_map(apdev[0], dev[0], 55, 7)
-    check_qos_map(apdev[0], dev[0], 56, 56 >> 3)
-    check_qos_map(apdev[0], dev[0], 63, 63 >> 3)
+    check_qos_map(apdev[0], hapd, dev[0], 53, 7)
+    check_qos_map(apdev[0], hapd, dev[0], 22, 6)
+    check_qos_map(apdev[0], hapd, dev[0], 48, 7)
+    check_qos_map(apdev[0], hapd, dev[0], 55, 7)
+    check_qos_map(apdev[0], hapd, dev[0], 56, 56 >> 3)
+    check_qos_map(apdev[0], hapd, dev[0], 63, 63 >> 3)
 
 def test_ap_qosmap_default(dev, apdev):
     """QoS mapping with default values"""
     ssid = "test-qosmap-default"
     params = { "ssid": ssid }
-    hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.add_ap(apdev[0]['ifname'], params)
     dev[0].connect(ssid, key_mgmt="NONE", scan_freq="2412")
     for dscp in [ 0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]:
-        check_qos_map(apdev[0], dev[0], dscp, dscp >> 3)
+        check_qos_map(apdev[0], hapd, dev[0], dscp, dscp >> 3)
 
 def test_ap_qosmap_default_acm(dev, apdev):
     """QoS mapping with default values and ACM=1 for VO/VI"""
@@ -98,7 +97,7 @@ def test_ap_qosmap_default_acm(dev, apdev):
                "wmm_ac_vo_cwmax": "2",
                "wmm_ac_vo_txop_limit": "47",
                "wmm_ac_vo_acm": "1"  }
-    hostapd.add_ap(apdev[0]['ifname'], params)
+    hapd = hostapd.add_ap(apdev[0]['ifname'], params)
     dev[0].connect(ssid, key_mgmt="NONE", scan_freq="2412")
     for dscp in [ 0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]:
         ap_tid = dscp >> 3
@@ -106,7 +105,7 @@ def test_ap_qosmap_default_acm(dev, apdev):
         # downgrade VI/VO to BE
         if tid in [ 4, 5, 6, 7 ]:
             tid = 3
-        check_qos_map(apdev[0], dev[0], dscp, tid, ap_tid)
+        check_qos_map(apdev[0], hapd, dev[0], dscp, tid, ap_tid)
 
 def test_ap_qosmap_invalid(dev, apdev):
     """QoS mapping ctrl_iface error handling"""