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

tests: Refactor MSCS

Browse source 
Add helper functions for common logic.

Signed-off-by: Daniel Gabay <daniel.gabay@intel.com>
This commit is contained in:
Daniel Gabay 2023-12-26 11:45:24 +02:00 committed by Jouni Malinen
parent b9983b35db
commit 3055838ebe
1 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
tests/hwsim/test_mscs.py
View file

@ -43,6 +43,25 @@ def wait_mscs_result(dev, expect_status=0):
if "status_code=%d" % expect_status not in ev: if "status_code=%d" % expect_status not in ev:
raise Exception("Unexpected MSCS result: " + ev) raise Exception("Unexpected MSCS result: " + ev)
def add_mscs_ap(apdev, reg_mscs_req=True, mscs_supported=True,
assocresp_elements=None):
params = {"ssid": "mscs"}
if mscs_supported:
params["ext_capa"] = 10*"00" + "20"
else:
params["ext_capa_mask"] = 10*"00" + "20"
if assocresp_elements is not None:
params['assocresp_elements'] = assocresp_elements
hapd = hostapd.add_ap(apdev, params)
if reg_mscs_req:
register_mcsc_req(hapd)
return hapd
def test_mscs_invalid_params(dev, apdev): def test_mscs_invalid_params(dev, apdev):
"""MSCS command invalid parameters""" """MSCS command invalid parameters"""
tests = ["", tests = ["",
@ -58,17 +77,18 @@ def test_mscs_invalid_params(dev, apdev):
if "FAIL" not in dev[0].request("MSCS " + t): if "FAIL" not in dev[0].request("MSCS " + t):
raise Exception("Invalid MSCS parameters accepted: " + t) raise Exception("Invalid MSCS parameters accepted: " + t)
def test_mscs_without_ap_support(dev, apdev): def mscs_run(dev, apdev, func):
"""MSCS without AP support"""
try: try:
run_mscs_without_ap_support(dev, apdev) func(dev, apdev)
finally: finally:
dev[0].request("MSCS remove") dev[0].request("MSCS remove")
def test_mscs_without_ap_support(dev, apdev):
"""MSCS without AP support"""
mscs_run(dev, apdev, run_mscs_without_ap_support)
def run_mscs_without_ap_support(dev, apdev): def run_mscs_without_ap_support(dev, apdev):
params = {"ssid": "mscs", add_mscs_ap(apdev[0], reg_mscs_req=False, mscs_supported=False)
"ext_capa_mask": 10*"00" + "20"}
hapd = hostapd.add_ap(apdev[0], params)
cmd = "MSCS add up_bitmap=F0 up_limit=7 stream_timeout=12345 frame_classifier=045F" cmd = "MSCS add up_bitmap=F0 up_limit=7 stream_timeout=12345 frame_classifier=045F"
if "OK" not in dev[0].request(cmd): if "OK" not in dev[0].request(cmd):
@ -86,16 +106,10 @@ def run_mscs_without_ap_support(dev, apdev):
def test_mscs_post_assoc(dev, apdev): def test_mscs_post_assoc(dev, apdev):
"""MSCS configuration post-association""" """MSCS configuration post-association"""
try: mscs_run(dev, apdev, run_mscs_post_assoc)
run_mscs_post_assoc(dev, apdev)
finally:
dev[0].request("MSCS remove")
def run_mscs_post_assoc(dev, apdev): def run_mscs_post_assoc(dev, apdev):
params = {"ssid": "mscs", hapd = add_mscs_ap(apdev[0])
"ext_capa": 10*"00" + "20"}
hapd = hostapd.add_ap(apdev[0], params)
register_mcsc_req(hapd)
dev[0].connect("mscs", key_mgmt="NONE", scan_freq="2412") dev[0].connect("mscs", key_mgmt="NONE", scan_freq="2412")
@ -129,17 +143,11 @@ def run_mscs_post_assoc(dev, apdev):
def test_mscs_pre_assoc(dev, apdev): def test_mscs_pre_assoc(dev, apdev):
"""MSCS configuration pre-association""" """MSCS configuration pre-association"""
try: mscs_run(dev, apdev, run_mscs_pre_assoc)
run_mscs_pre_assoc(dev, apdev)
finally:
dev[0].request("MSCS remove")
def run_mscs_pre_assoc(dev, apdev): def run_mscs_pre_assoc(dev, apdev):
params = {"ssid": "mscs", ies = "ff0c5800000000000000" + "01020000"
"ext_capa": 10*"00" + "20", hapd = add_mscs_ap(apdev[0], assocresp_elements=ies)
"assocresp_elements": "ff0c5800000000000000" + "01020000"}
hapd = hostapd.add_ap(apdev[0], params)
register_mcsc_req(hapd)
cmd = "MSCS add up_bitmap=F0 up_limit=7 stream_timeout=12345 frame_classifier=045F" cmd = "MSCS add up_bitmap=F0 up_limit=7 stream_timeout=12345 frame_classifier=045F"
if "OK" not in dev[0].request(cmd): if "OK" not in dev[0].request(cmd):
@ -171,17 +179,11 @@ def run_mscs_pre_assoc(dev, apdev):
def test_mscs_assoc_failure(dev, apdev): def test_mscs_assoc_failure(dev, apdev):
"""MSCS configuration failure during association exchange""" """MSCS configuration failure during association exchange"""
try: mscs_run(dev, apdev, run_mscs_assoc_failure)
run_mscs_assoc_failure(dev, apdev)
finally:
dev[0].request("MSCS remove")
def run_mscs_assoc_failure(dev, apdev): def run_mscs_assoc_failure(dev, apdev):
params = {"ssid": "mscs", ies = "ff0c5800000000000000" + "01020001"
"ext_capa": 10*"00" + "20", hapd = add_mscs_ap(apdev[0], assocresp_elements=ies)
"assocresp_elements": "ff0c5800000000000000" + "01020001"}
hapd = hostapd.add_ap(apdev[0], params)
register_mcsc_req(hapd)
cmd = "MSCS add up_bitmap=F0 up_limit=7 stream_timeout=12345 frame_classifier=045F" cmd = "MSCS add up_bitmap=F0 up_limit=7 stream_timeout=12345 frame_classifier=045F"
if "OK" not in dev[0].request(cmd): if "OK" not in dev[0].request(cmd):
@ -208,17 +210,10 @@ def run_mscs_assoc_failure(dev, apdev):
def test_mscs_local_errors(dev, apdev): def test_mscs_local_errors(dev, apdev):
"""MSCS configuration local errors""" """MSCS configuration local errors"""
try: mscs_run(dev, apdev, run_mscs_local_errors)
run_mscs_local_errors(dev, apdev)
finally:
dev[0].request("MSCS remove")
def run_mscs_local_errors(dev, apdev): def run_mscs_local_errors(dev, apdev):
params = {"ssid": "mscs", hapd = add_mscs_ap(apdev[0])
"ext_capa": 10*"00" + "20"}
hapd = hostapd.add_ap(apdev[0], params)
register_mcsc_req(hapd)
dev[0].connect("mscs", key_mgmt="NONE", scan_freq="2412") dev[0].connect("mscs", key_mgmt="NONE", scan_freq="2412")
hapd.dump_monitor() hapd.dump_monitor()