tests: Allow ap_ft for remote tests
Fix problem when running ap_ft test cases with real HW using remote tests and hwsim wrapper by using the newer hostapd.app_ap() API. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@gmail.com>
This commit is contained in:
parent
b9e8f920a8
commit
b098542cd4
1 changed files with 12 additions and 12 deletions
|
@ -240,11 +240,11 @@ def test_ap_ft_local_key_gen(dev, apdev):
|
|||
params = ft_params1a(ssid=ssid, passphrase=passphrase)
|
||||
params['ft_psk_generate_local'] = "1";
|
||||
del params['pmk_r1_push']
|
||||
hapd0 = hostapd.add_ap(apdev[0]['ifname'], params)
|
||||
hapd0 = hostapd.add_ap(apdev[0], params)
|
||||
params = ft_params2a(ssid=ssid, passphrase=passphrase)
|
||||
params['ft_psk_generate_local'] = "1";
|
||||
del params['pmk_r1_push']
|
||||
hapd1 = hostapd.add_ap(apdev[1]['ifname'], params)
|
||||
hapd1 = hostapd.add_ap(apdev[1], params)
|
||||
|
||||
run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase)
|
||||
if "[WPA2-FT/PSK-CCMP]" not in dev[0].request("SCAN_RESULTS"):
|
||||
|
@ -733,13 +733,13 @@ def test_ap_ft_mismatching_rrb_key_push_eap(dev, apdev):
|
|||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd0 = hostapd.add_ap(apdev[0]['ifname'], params)
|
||||
hapd0 = hostapd.add_ap(apdev[0], params)
|
||||
params = ft_params2_incorrect_rrb_key(ssid=ssid, passphrase=passphrase)
|
||||
params["ieee80211w"] = "2";
|
||||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd1 = hostapd.add_ap(apdev[1]['ifname'], params)
|
||||
hapd1 = hostapd.add_ap(apdev[1], params)
|
||||
|
||||
run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, over_ds=True,
|
||||
fail_test=True, eap=True)
|
||||
|
@ -755,13 +755,13 @@ def test_ap_ft_mismatching_rrb_key_pull_eap(dev, apdev):
|
|||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd0 = hostapd.add_ap(apdev[0]['ifname'], params)
|
||||
hapd0 = hostapd.add_ap(apdev[0], params)
|
||||
params = ft_params2_incorrect_rrb_key(ssid=ssid, passphrase=passphrase)
|
||||
params["pmk_r1_push"] = "0"
|
||||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd1 = hostapd.add_ap(apdev[1]['ifname'], params)
|
||||
hapd1 = hostapd.add_ap(apdev[1], params)
|
||||
|
||||
run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, over_ds=True,
|
||||
fail_test=True, eap=True)
|
||||
|
@ -778,7 +778,7 @@ def test_ap_ft_mismatching_r0kh_id_pull_eap(dev, apdev):
|
|||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hostapd.add_ap(apdev[0]['ifname'], params)
|
||||
hostapd.add_ap(apdev[0], params)
|
||||
dev[0].connect(ssid, key_mgmt="FT-EAP", proto="WPA2", ieee80211w="1",
|
||||
eap="GPSK", identity="gpsk user",
|
||||
password="abcdefghijklmnop0123456789abcdef",
|
||||
|
@ -789,7 +789,7 @@ def test_ap_ft_mismatching_r0kh_id_pull_eap(dev, apdev):
|
|||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hostapd.add_ap(apdev[1]['ifname'], params)
|
||||
hostapd.add_ap(apdev[1], params)
|
||||
|
||||
dev[0].scan_for_bss(apdev[1]['bssid'], freq="2412")
|
||||
dev[0].roam_over_ds(apdev[1]['bssid'], fail_test=True)
|
||||
|
@ -805,13 +805,13 @@ def test_ap_ft_mismatching_rrb_r0kh_push_eap(dev, apdev):
|
|||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd0 = hostapd.add_ap(apdev[0]['ifname'], params)
|
||||
hapd0 = hostapd.add_ap(apdev[0], params)
|
||||
params = ft_params2_r0kh_mismatch(ssid=ssid, passphrase=passphrase)
|
||||
params["ieee80211w"] = "2";
|
||||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd1 = hostapd.add_ap(apdev[1]['ifname'], params)
|
||||
hapd1 = hostapd.add_ap(apdev[1], params)
|
||||
|
||||
run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, over_ds=True,
|
||||
fail_test=True, eap=True)
|
||||
|
@ -827,13 +827,13 @@ def test_ap_ft_mismatching_rrb_r0kh_pull_eap(dev, apdev):
|
|||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd0 = hostapd.add_ap(apdev[0]['ifname'], params)
|
||||
hapd0 = hostapd.add_ap(apdev[0], params)
|
||||
params = ft_params2(ssid=ssid, passphrase=passphrase)
|
||||
params["pmk_r1_push"] = "0"
|
||||
params['wpa_key_mgmt'] = "FT-EAP"
|
||||
params["ieee8021x"] = "1"
|
||||
params = dict(radius.items() + params.items())
|
||||
hapd1 = hostapd.add_ap(apdev[1]['ifname'], params)
|
||||
hapd1 = hostapd.add_ap(apdev[1], params)
|
||||
|
||||
run_roams(dev[0], apdev, hapd0, hapd1, ssid, passphrase, over_ds=True,
|
||||
fail_test=True, eap=True)
|
||||
|
|
Loading…
Reference in a new issue