Updated to hostap_2_6

[mech_eap.git] / libeap / tests / hwsim / test_ap_csa.py

diff --git a/libeap/tests/hwsim/test_ap_csa.py b/libeap/tests/hwsim/test_ap_csa.py
index c88e517..902d428 100644 (file)
--- a/libeap/tests/hwsim/test_ap_csa.py
+++ b/libeap/tests/hwsim/test_ap_csa.py
@@ -4,6 +4,7 @@
 # This software may be distributed under the terms of the BSD license.
 # See README for more details.
 
+from remotehost import remote_compatible
 import time
 import logging
 logger = logging.getLogger()
@@ -12,11 +13,12 @@ import hwsim_utils
 import hostapd
 from utils import HwsimSkip
 
-def connect(dev, apdev):
+def connect(dev, apdev, **kwargs):
     params = { "ssid": "ap-csa",
                "channel": "1" }
-    ap = hostapd.add_ap(apdev[0]['ifname'], params)
-    dev.connect("ap-csa", key_mgmt="NONE")
+    params.update(kwargs)
+    ap = hostapd.add_ap(apdev[0], params)
+    dev.connect("ap-csa", key_mgmt="NONE", scan_freq="2412")
     return ap
 
 def switch_channel(ap, count, freq):
@@ -26,7 +28,13 @@ def switch_channel(ap, count, freq):
         raise Exception("CSA finished event timed out")
     if "freq=" + str(freq) not in ev:
         raise Exception("Unexpected channel in CSA finished event")
-    time.sleep(0.1)
+
+def wait_channel_switch(dev, freq):
+    ev = dev.wait_event(["CTRL-EVENT-CHANNEL-SWITCH"], timeout=5)
+    if ev is None:
+        raise Exception("Channel switch not reported")
+    if "freq=%d" % freq not in ev:
+        raise Exception("Unexpected frequency: " + ev)
 
 # This function checks whether the provided dev, which may be either
 # WpaSupplicant or Hostapd supports CSA.
@@ -35,6 +43,7 @@ def csa_supported(dev):
     if (int(res['capa.flags'], 0) & 0x80000000) == 0:
         raise HwsimSkip("CSA not supported")
 
+@remote_compatible
 def test_ap_csa_1_switch(dev, apdev):
     """AP Channel Switch, one switch"""
     csa_supported(dev[0])
@@ -42,8 +51,10 @@ def test_ap_csa_1_switch(dev, apdev):
 
     hwsim_utils.test_connectivity(dev[0], ap)
     switch_channel(ap, 10, 2462)
+    wait_channel_switch(dev[0], 2462)
     hwsim_utils.test_connectivity(dev[0], ap)
 
+@remote_compatible
 def test_ap_csa_2_switches(dev, apdev):
     """AP Channel Switch, two switches"""
     csa_supported(dev[0])
@@ -51,10 +62,13 @@ def test_ap_csa_2_switches(dev, apdev):
 
     hwsim_utils.test_connectivity(dev[0], ap)
     switch_channel(ap, 10, 2462)
+    wait_channel_switch(dev[0], 2462)
     hwsim_utils.test_connectivity(dev[0], ap)
     switch_channel(ap, 10, 2412)
+    wait_channel_switch(dev[0], 2412)
     hwsim_utils.test_connectivity(dev[0], ap)
 
+@remote_compatible
 def test_ap_csa_1_switch_count_0(dev, apdev):
     """AP Channel Switch, one switch with count 0"""
     csa_supported(dev[0])
@@ -65,6 +79,7 @@ def test_ap_csa_1_switch_count_0(dev, apdev):
     # this does not result in CSA currently, so do not bother checking
     # connectivity
 
+@remote_compatible
 def test_ap_csa_2_switches_count_0(dev, apdev):
     """AP Channel Switch, two switches with count 0"""
     csa_supported(dev[0])
@@ -78,6 +93,7 @@ def test_ap_csa_2_switches_count_0(dev, apdev):
     # this does not result in CSA currently, so do not bother checking
     # connectivity
 
+@remote_compatible
 def test_ap_csa_1_switch_count_1(dev, apdev):
     """AP Channel Switch, one switch with count 1"""
     csa_supported(dev[0])
@@ -88,6 +104,7 @@ def test_ap_csa_1_switch_count_1(dev, apdev):
     # this does not result in CSA currently, so do not bother checking
     # connectivity
 
+@remote_compatible
 def test_ap_csa_2_switches_count_1(dev, apdev):
     """AP Channel Switch, two switches with count 1"""
     csa_supported(dev[0])
@@ -101,6 +118,7 @@ def test_ap_csa_2_switches_count_1(dev, apdev):
     # this does not result in CSA currently, so do not bother checking
     # connectivity
 
+@remote_compatible
 def test_ap_csa_1_switch_count_2(dev, apdev):
     """AP Channel Switch, one switch with count 2"""
     csa_supported(dev[0])
@@ -108,4 +126,27 @@ def test_ap_csa_1_switch_count_2(dev, apdev):
 
     hwsim_utils.test_connectivity(dev[0], ap)
     switch_channel(ap, 2, 2462)
+    wait_channel_switch(dev[0], 2462)
+    hwsim_utils.test_connectivity(dev[0], ap)
+
+@remote_compatible
+def test_ap_csa_ecsa_only(dev, apdev):
+    """AP Channel Switch, one switch with only ECSA IE"""
+    csa_supported(dev[0])
+    ap = connect(dev[0], apdev, ecsa_ie_only="1")
+
     hwsim_utils.test_connectivity(dev[0], ap)
+    switch_channel(ap, 10, 2462)
+    wait_channel_switch(dev[0], 2462)
+    hwsim_utils.test_connectivity(dev[0], ap)
+
+@remote_compatible
+def test_ap_csa_invalid(dev, apdev):
+    """AP Channel Switch - invalid channel"""
+    csa_supported(dev[0])
+    ap = connect(dev[0], apdev)
+
+    vals = [ 2461, 4900, 4901, 5181, 5746, 5699, 5895, 5899 ]
+    for val in vals:
+        if "FAIL" not in ap.request("CHAN_SWITCH 1 %d" % val):
+            raise Exception("Invalid channel accepted: %d" % val)