tests: DPP PB channel changes

Prepare for an implementation change for the PB discovery channel list.
Move the standlone (not an AP) PB Configurators to a preferred channel
and enable Configurator connectivity indication in APs that act as PB
Configurators.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/tests/hwsim/test_dpp3.py b/tests/hwsim/test_dpp3.py
index b8bf309d149efc46002fcf707da5801bd96b4f3c..0ee71b12c208da50143422026989fd1861e89338 100644 (file)
--- a/tests/hwsim/test_dpp3.py
+++ b/tests/hwsim/test_dpp3.py
@@ -282,6 +282,7 @@ def run_dpp_controller_relay_pkex(dev, apdev, params):
 
 def dpp_pb_ap(apdev):
     params = {"ssid": "sae",
+              "dpp_configurator_connectivity": "1",
               "wpa": "2",
               "wpa_key_mgmt": "SAE",
               "ieee80211w": "2",
@@ -384,7 +385,7 @@ def test_dpp_push_button_session_overlap_configurator(dev, apdev):
     check_dpp_capab(dev[1], min_ver=3)
     check_dpp_capab(dev[2], min_ver=3)
 
-    dev[0].dpp_listen(2412)
+    dev[0].dpp_listen(2437)
     conf_id = dev[1].dpp_configurator_add()
     ssid = "example"
     ssid_hex = binascii.hexlify(ssid.encode()).decode()
@@ -528,7 +529,7 @@ def test_dpp_push_button_wpas_conf(dev, apdev):
     check_dpp_capab(dev[0], min_ver=3)
     check_dpp_capab(dev[1], min_ver=3)
 
-    dev[1].dpp_listen(2412)
+    dev[1].dpp_listen(2437)
     conf_id = dev[1].dpp_configurator_add()
     ssid = "example"
     ssid_hex = binascii.hexlify(ssid.encode()).decode()

diff --git a/tests/hwsim/test_sigma_dut.py b/tests/hwsim/test_sigma_dut.py
index 50130eacc968bfd8b7bc6740501fd2699f0eb269..156e02719d5376621ec8438d66eebdbee8d31a70 100644 (file)
--- a/tests/hwsim/test_sigma_dut.py
+++ b/tests/hwsim/test_sigma_dut.py
@@ -4186,6 +4186,7 @@ def test_sigma_dut_dpp_pb_sta(dev, apdev):
     check_sae_capab(dev[0])
 
     params = {"ssid": "sae",
+              "dpp_configurator_connectivity": "1",
               "wpa": "2",
               "wpa_key_mgmt": "SAE",
               "ieee80211w": "2",
@@ -4223,6 +4224,7 @@ def test_sigma_dut_dpp_pb_sta_first(dev, apdev):
     check_sae_capab(dev[0])
 
     params = {"ssid": "sae",
+              "dpp_configurator_connectivity": "1",
               "wpa": "2",
               "wpa_key_mgmt": "SAE",
               "ieee80211w": "2",
@@ -4268,6 +4270,7 @@ def test_sigma_dut_dpp_pb_sta_session_overlap(dev, apdev):
     check_sae_capab(dev[0])
 
     params = {"ssid": "sae",
+              "dpp_configurator_connectivity": "1",
               "wpa": "2",
               "wpa_key_mgmt": "SAE",
               "ieee80211w": "2",
@@ -4275,6 +4278,7 @@ def test_sigma_dut_dpp_pb_sta_session_overlap(dev, apdev):
               "sae_password": "sae-password"}
     hapd = hostapd.add_ap(apdev[0], params)
     params = {"ssid": "another sae",
+              "dpp_configurator_connectivity": "1",
               "channel": "11",
               "wpa": "2",
               "wpa_key_mgmt": "SAE",
@@ -4352,6 +4356,7 @@ def test_sigma_dut_dpp_pb_sta_misbehavior(dev, apdev):
     check_sae_capab(dev[0])
 
     params = {"ssid": "sae",
+              "dpp_configurator_connectivity": "1",
               "wpa": "2",
               "wpa_key_mgmt": "SAE",
               "ieee80211w": "2",
@@ -4390,7 +4395,7 @@ def test_sigma_dut_dpp_pb_ap(dev, apdev, params):
         try:
             sigma_dut_cmd_check("ap_reset_default,program,DPP")
 
-            sigma_dut_cmd_check("ap_set_wireless,NAME,AP,CHANNEL,1,SSID,test-sae,MODE,11ng")
+            sigma_dut_cmd_check("ap_set_wireless,NAME,AP,CHANNEL,6,SSID,test-sae,MODE,11ng")
             sigma_dut_cmd_check("ap_set_security,NAME,AP,KEYMGNT,WPA2-SAE,PSK,12345678")
             sigma_dut_cmd_check("ap_config_commit,NAME,AP")