DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Use new names for network profile BSSID ignore/accept parameters

Browse source 
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2021-02-07 16:19:09 +02:00
parent 752b1c6081
commit 125f0748e4
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/hwsim/test_ap_open.py
View file

@ -297,18 +297,18 @@ def test_ap_open_out_of_memory(dev, apdev):
# not fail # not fail
hostapd.add_ap(apdev[1], {"ssid": "open"}) hostapd.add_ap(apdev[1], {"ssid": "open"})
def test_bssid_black_white_list(dev, apdev): def test_bssid_ignore_accept(dev, apdev):
"""BSSID black/white list""" """BSSID ignore/accept list"""
hapd = hostapd.add_ap(apdev[0], {"ssid": "open"}) hapd = hostapd.add_ap(apdev[0], {"ssid": "open"})
hapd2 = hostapd.add_ap(apdev[1], {"ssid": "open"}) hapd2 = hostapd.add_ap(apdev[1], {"ssid": "open"})
dev[0].connect("open", key_mgmt="NONE", scan_freq="2412", dev[0].connect("open", key_mgmt="NONE", scan_freq="2412",
bssid_whitelist=apdev[1]['bssid']) bssid_accept=apdev[1]['bssid'])
dev[1].connect("open", key_mgmt="NONE", scan_freq="2412", dev[1].connect("open", key_mgmt="NONE", scan_freq="2412",
bssid_blacklist=apdev[1]['bssid']) bssid_ignore=apdev[1]['bssid'])
dev[2].connect("open", key_mgmt="NONE", scan_freq="2412", dev[2].connect("open", key_mgmt="NONE", scan_freq="2412",
bssid_whitelist="00:00:00:00:00:00/00:00:00:00:00:00", bssid_accept="00:00:00:00:00:00/00:00:00:00:00:00",
bssid_blacklist=apdev[1]['bssid']) bssid_ignore=apdev[1]['bssid'])
if dev[0].get_status_field('bssid') != apdev[1]['bssid']: if dev[0].get_status_field('bssid') != apdev[1]['bssid']:
raise Exception("dev[0] connected to unexpected AP") raise Exception("dev[0] connected to unexpected AP")
if dev[1].get_status_field('bssid') != apdev[0]['bssid']: if dev[1].get_status_field('bssid') != apdev[0]['bssid']:
@ -320,11 +320,11 @@ def test_bssid_black_white_list(dev, apdev):
dev[2].request("REMOVE_NETWORK all") dev[2].request("REMOVE_NETWORK all")
dev[2].connect("open", key_mgmt="NONE", scan_freq="2412", dev[2].connect("open", key_mgmt="NONE", scan_freq="2412",
bssid_whitelist="00:00:00:00:00:00", wait_connect=False) bssid_accept="00:00:00:00:00:00", wait_connect=False)
dev[0].connect("open", key_mgmt="NONE", scan_freq="2412", dev[0].connect("open", key_mgmt="NONE", scan_freq="2412",
bssid_whitelist="11:22:33:44:55:66/ff:00:00:00:00:00 " + apdev[1]['bssid'] + " aa:bb:cc:dd:ee:ff") bssid_accept="11:22:33:44:55:66/ff:00:00:00:00:00 " + apdev[1]['bssid'] + " aa:bb:cc:dd:ee:ff")
dev[1].connect("open", key_mgmt="NONE", scan_freq="2412", dev[1].connect("open", key_mgmt="NONE", scan_freq="2412",
bssid_blacklist="11:22:33:44:55:66/ff:00:00:00:00:00 " + apdev[1]['bssid'] + " aa:bb:cc:dd:ee:ff") bssid_ignore="11:22:33:44:55:66/ff:00:00:00:00:00 " + apdev[1]['bssid'] + " aa:bb:cc:dd:ee:ff")
if dev[0].get_status_field('bssid') != apdev[1]['bssid']: if dev[0].get_status_field('bssid') != apdev[1]['bssid']:
raise Exception("dev[0] connected to unexpected AP") raise Exception("dev[0] connected to unexpected AP")
if dev[1].get_status_field('bssid') != apdev[0]['bssid']: if dev[1].get_status_field('bssid') != apdev[0]['bssid']:

16
tests/hwsim/test_wpas_ctrl.py
View file

@ -266,14 +266,14 @@ def test_wpas_ctrl_network(dev):
"f2:99:88:77:66:55 02:11:22:33:44:55/ff:00:ff:00:ff:00 12:34:56:78:90:ab", "f2:99:88:77:66:55 02:11:22:33:44:55/ff:00:ff:00:ff:00 12:34:56:78:90:ab",
"02:11:22:33:44:55/ff:ff:ff:00:00:00 02:ae:be:ce:53:77/00:00:00:00:00:ff"] "02:11:22:33:44:55/ff:ff:ff:00:00:00 02:ae:be:ce:53:77/00:00:00:00:00:ff"]
for val in tests: for val in tests:
dev[0].set_network(id, "bssid_blacklist", val) dev[0].set_network(id, "bssid_ignore", val)
res = dev[0].get_network(id, "bssid_blacklist") res = dev[0].get_network(id, "bssid_ignore")
if res != val: if res != val:
raise Exception("Unexpected bssid_blacklist value: %s != %s" % (res, val)) raise Exception("Unexpected bssid_ignore value: %s != %s" % (res, val))
dev[0].set_network(id, "bssid_whitelist", val) dev[0].set_network(id, "bssid_accept", val)
res = dev[0].get_network(id, "bssid_whitelist") res = dev[0].get_network(id, "bssid_accept")
if res != val: if res != val:
raise Exception("Unexpected bssid_whitelist value: %s != %s" % (res, val)) raise Exception("Unexpected bssid_accept value: %s != %s" % (res, val))
tests = ["foo", tests = ["foo",
"00:11:22:33:44:5", "00:11:22:33:44:5",
@ -281,8 +281,8 @@ def test_wpas_ctrl_network(dev):
"00:11:22:33:44:55/", "00:11:22:33:44:55/",
"00:11:22:33:44:55/66:77:88:99:aa:b"] "00:11:22:33:44:55/66:77:88:99:aa:b"]
for val in tests: for val in tests:
if "FAIL" not in dev[0].request("SET_NETWORK %d bssid_blacklist %s" % (id, val)): if "FAIL" not in dev[0].request("SET_NETWORK %d bssid_ignore %s" % (id, val)):
raise Exception("Invalid bssid_blacklist value accepted") raise Exception("Invalid bssid_ignore value accepted")
@remote_compatible @remote_compatible
def test_wpas_ctrl_network_oom(dev): def test_wpas_ctrl_network_oom(dev):

4
tests/hwsim/wpasupplicant.py
View file

@ -1095,8 +1095,8 @@ class WpaSupplicant:
"disable_max_amsdu", "ampdu_factor", "ampdu_density", "disable_max_amsdu", "ampdu_factor", "ampdu_density",
"disable_ht40", "disable_sgi", "disable_ldpc", "disable_ht40", "disable_sgi", "disable_ldpc",
"ht40_intolerant", "update_identifier", "mac_addr", "ht40_intolerant", "update_identifier", "mac_addr",
"erp", "bg_scan_period", "bssid_blacklist", "erp", "bg_scan_period", "bssid_ignore",
"bssid_whitelist", "mem_only_psk", "eap_workaround", "bssid_accept", "mem_only_psk", "eap_workaround",
"engine", "fils_dh_group", "bssid_hint", "engine", "fils_dh_group", "bssid_hint",
"dpp_csign", "dpp_csign_expiry", "dpp_csign", "dpp_csign_expiry",
"dpp_netaccesskey", "dpp_netaccesskey_expiry", "dpp_pfs", "dpp_netaccesskey", "dpp_netaccesskey_expiry", "dpp_pfs",