]> git.ipfire.org Git - thirdparty/hostap.git/blobdiff - tests/hwsim/test_ap_pmf.py
projects / thirdparty / hostap.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tests: Pass AP devices to test cases
[thirdparty/hostap.git] / tests / hwsim / test_ap_pmf.py
diff --git a/tests/hwsim/test_ap_pmf.py b/tests/hwsim/test_ap_pmf.py
index 87247b9355d58d6edee73eb509500c95783cdd4d..33e023b577adb0b77dfce41a990bd9ec1f875db1 100644 (file)
--- a/tests/hwsim/test_ap_pmf.py
+++ b/tests/hwsim/test_ap_pmf.py
@@ -15,10 +15,7 @@ import hwsim_utils
 import hostapd
 from wlantest import Wlantest
 
-ap_ifname = 'wlan2'
-bssid = "02:00:00:00:02:00"
-
-def test_ap_pmf_required(dev):
+def test_ap_pmf_required(dev, apdev):
     """WPA2-PSK AP with PMF required"""
     ssid = "test-pmf-required"
     wt = Wlantest()
@@ -27,26 +24,28 @@ def test_ap_pmf_required(dev):
     params = hostapd.wpa2_params(ssid=ssid, passphrase="12345678")
     params["wpa_key_mgmt"] = "WPA-PSK-SHA256";
     params["ieee80211w"] = "2";
-    hostapd.add_ap(ap_ifname, params)
-    dev[0].connect(ssid, psk="12345678", ieee80211w="1", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-    hwsim_utils.test_connectivity(dev[0].ifname, ap_ifname)
-    dev[1].connect(ssid, psk="12345678", ieee80211w="2", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-    hwsim_utils.test_connectivity(dev[1].ifname, ap_ifname)
-    hapd = hostapd.Hostapd(ap_ifname)
+    hostapd.add_ap(apdev[0]['ifname'], params)
+    dev[0].connect(ssid, psk="12345678", ieee80211w="1",
+                   key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+    hwsim_utils.test_connectivity(dev[0].ifname, apdev[0]['ifname'])
+    dev[1].connect(ssid, psk="12345678", ieee80211w="2",
+                   key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+    hwsim_utils.test_connectivity(dev[1].ifname, apdev[0]['ifname'])
+    hapd = hostapd.Hostapd(apdev[0]['ifname'])
     hapd.request("SA_QUERY " + dev[0].p2p_interface_addr())
     hapd.request("SA_QUERY " + dev[1].p2p_interface_addr())
-    wt.require_ap_pmf_mandatory(bssid)
-    wt.require_sta_pmf(bssid, dev[0].p2p_interface_addr())
-    wt.require_sta_pmf_mandatory(bssid, dev[1].p2p_interface_addr())
+    wt.require_ap_pmf_mandatory(apdev[0]['bssid'])
+    wt.require_sta_pmf(apdev[0]['bssid'], dev[0].p2p_interface_addr())
+    wt.require_sta_pmf_mandatory(apdev[0]['bssid'], dev[1].p2p_interface_addr())
     time.sleep(0.1)
-    if wt.get_sta_counter("valid_saqueryresp_tx", bssid,
+    if wt.get_sta_counter("valid_saqueryresp_tx", apdev[0]['bssid'],
                           dev[0].p2p_interface_addr()) < 1:
         raise Exception("STA did not reply to SA Query")
-    if wt.get_sta_counter("valid_saqueryresp_tx", bssid,
+    if wt.get_sta_counter("valid_saqueryresp_tx", apdev[0]['bssid'],
                           dev[1].p2p_interface_addr()) < 1:
         raise Exception("STA did not reply to SA Query")
 
-def test_ap_pmf_optional(dev):
+def test_ap_pmf_optional(dev, apdev):
     """WPA2-PSK AP with PMF optional"""
     ssid = "test-pmf-optional"
     wt = Wlantest()
@@ -55,16 +54,18 @@ def test_ap_pmf_optional(dev):
     params = hostapd.wpa2_params(ssid=ssid, passphrase="12345678")
     params["wpa_key_mgmt"] = "WPA-PSK";
     params["ieee80211w"] = "1";
-    hostapd.add_ap(ap_ifname, params)
-    dev[0].connect(ssid, psk="12345678", ieee80211w="1", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-    hwsim_utils.test_connectivity(dev[0].ifname, ap_ifname)
-    dev[1].connect(ssid, psk="12345678", ieee80211w="2", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-    hwsim_utils.test_connectivity(dev[1].ifname, ap_ifname)
-    wt.require_ap_pmf_optional(bssid)
-    wt.require_sta_pmf(bssid, dev[0].p2p_interface_addr())
-    wt.require_sta_pmf_mandatory(bssid, dev[1].p2p_interface_addr())
+    hostapd.add_ap(apdev[0]['ifname'], params)
+    dev[0].connect(ssid, psk="12345678", ieee80211w="1",
+                   key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+    hwsim_utils.test_connectivity(dev[0].ifname, apdev[0]['ifname'])
+    dev[1].connect(ssid, psk="12345678", ieee80211w="2",
+                   key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+    hwsim_utils.test_connectivity(dev[1].ifname, apdev[0]['ifname'])
+    wt.require_ap_pmf_optional(apdev[0]['bssid'])
+    wt.require_sta_pmf(apdev[0]['bssid'], dev[0].p2p_interface_addr())
+    wt.require_sta_pmf_mandatory(apdev[0]['bssid'], dev[1].p2p_interface_addr())
 
-def test_ap_pmf_optional_2akm(dev):
+def test_ap_pmf_optional_2akm(dev, apdev):
     """WPA2-PSK AP with PMF optional (2 AKMs)"""
     ssid = "test-pmf-optional-2akm"
     wt = Wlantest()
@@ -73,31 +74,37 @@ def test_ap_pmf_optional_2akm(dev):
     params = hostapd.wpa2_params(ssid=ssid, passphrase="12345678")
     params["wpa_key_mgmt"] = "WPA-PSK WPA-PSK-SHA256";
     params["ieee80211w"] = "1";
-    hostapd.add_ap(ap_ifname, params)
-    dev[0].connect(ssid, psk="12345678", ieee80211w="1", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-    hwsim_utils.test_connectivity(dev[0].ifname, ap_ifname)
-    dev[1].connect(ssid, psk="12345678", ieee80211w="2", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-    hwsim_utils.test_connectivity(dev[1].ifname, ap_ifname)
-    wt.require_ap_pmf_optional(bssid)
-    wt.require_sta_pmf(bssid, dev[0].p2p_interface_addr())
-    wt.require_sta_key_mgmt(bssid, dev[0].p2p_interface_addr(), "PSK-SHA256")
-    wt.require_sta_pmf_mandatory(bssid, dev[1].p2p_interface_addr())
-    wt.require_sta_key_mgmt(bssid, dev[1].p2p_interface_addr(), "PSK-SHA256")
+    hostapd.add_ap(apdev[0]['ifname'], params)
+    dev[0].connect(ssid, psk="12345678", ieee80211w="1",
+                   key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+    hwsim_utils.test_connectivity(dev[0].ifname, apdev[0]['ifname'])
+    dev[1].connect(ssid, psk="12345678", ieee80211w="2",
+                   key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+    hwsim_utils.test_connectivity(dev[1].ifname, apdev[0]['ifname'])
+    wt.require_ap_pmf_optional(apdev[0]['bssid'])
+    wt.require_sta_pmf(apdev[0]['bssid'], dev[0].p2p_interface_addr())
+    wt.require_sta_key_mgmt(apdev[0]['bssid'], dev[0].p2p_interface_addr(),
+                            "PSK-SHA256")
+    wt.require_sta_pmf_mandatory(apdev[0]['bssid'], dev[1].p2p_interface_addr())
+    wt.require_sta_key_mgmt(apdev[0]['bssid'], dev[1].p2p_interface_addr(),
+                            "PSK-SHA256")
 
-def test_ap_pmf_negative(dev):
+def test_ap_pmf_negative(dev, apdev):
     """WPA2-PSK AP without PMF (negative test)"""
     ssid = "test-pmf-negative"
     wt = Wlantest()
     wt.flush()
     wt.add_passphrase("12345678")
     params = hostapd.wpa2_params(ssid=ssid, passphrase="12345678")
-    hostapd.add_ap(ap_ifname, params)
-    dev[0].connect(ssid, psk="12345678", ieee80211w="1", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-    hwsim_utils.test_connectivity(dev[0].ifname, ap_ifname)
+    hostapd.add_ap(apdev[0]['ifname'], params)
+    dev[0].connect(ssid, psk="12345678", ieee80211w="1",
+                   key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+    hwsim_utils.test_connectivity(dev[0].ifname, apdev[0]['ifname'])
     try:
-        dev[1].connect(ssid, psk="12345678", ieee80211w="2", key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
-        hwsim_utils.test_connectivity(dev[1].ifname, ap_ifname)
+        dev[1].connect(ssid, psk="12345678", ieee80211w="2",
+                       key_mgmt="WPA-PSK WPA-PSK-SHA256", proto="WPA2")
+        hwsim_utils.test_connectivity(dev[1].ifname, apdev[0]['ifname'])
         raise Exception("PMF required STA connected to no PMF AP")
     except Exception, e:
         logger.debug("Ignore expected exception: " + str(e))
-    wt.require_ap_no_pmf(bssid)
+    wt.require_ap_no_pmf(apdev[0]['bssid'])
Unnamed repository; edit this file 'description' to name the repository.