tests: Move hs20_t_c_server_url parameter from AP to AS

This is needed with the modified hostapd implementation to fix the
ap_hs20_terms_and_conditions* test cases.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>

diff --git a/tests/hwsim/auth_serv/as.conf b/tests/hwsim/auth_serv/as.conf
index d62d96bb68a5aa71ce4b9c3d030498e0835eacbe..bc3ae692a0d08208babbe562820bf5bd9cfa64db 100644 (file)
--- a/tests/hwsim/auth_serv/as.conf
+++ b/tests/hwsim/auth_serv/as.conf
@@ -23,3 +23,5 @@ eap_sim_aka_result_ind=1
 tls_flags=[ENABLE-TLSv1.3]
 
 dump_msk_file=LOGDIR/as-msk.lst
+
+hs20_t_c_server_url=https://example.com/t_and_c?addr=@1@&ap=123

diff --git a/tests/hwsim/test_ap_hs20.py b/tests/hwsim/test_ap_hs20.py
index 87850c86073b27f4b454789ce2d4a5c2382a977d..97bd91d335f5e713af54c9d8e04756367c57452e 100644 (file)
--- a/tests/hwsim/test_ap_hs20.py
+++ b/tests/hwsim/test_ap_hs20.py
@@ -5764,7 +5764,7 @@ def test_ap_hs20_terms_and_conditions(dev, apdev):
     params['hessid'] = bssid
     params['hs20_t_c_filename'] = 'terms-and-conditions'
     params['hs20_t_c_timestamp'] = '123456789'
-    params['hs20_t_c_server_url'] = 'https://example.com/t_and_c?addr=@1@&ap=123'
+
     hostapd.add_ap(apdev[0], params)
 
     dev[0].hs20_enable()
@@ -5795,7 +5795,6 @@ def test_ap_hs20_terms_and_conditions_coa(dev, apdev):
     params['hessid'] = bssid
     params['hs20_t_c_filename'] = 'terms-and-conditions'
     params['hs20_t_c_timestamp'] = '123456789'
-    params['hs20_t_c_server_url'] = 'https://example.com/t_and_c?addr=@1@&ap=123'
     params['own_ip_addr'] = "127.0.0.1"
     params['radius_das_port'] = "3799"
     params['radius_das_client'] = "127.0.0.1 secret"
@@ -5883,6 +5882,7 @@ def test_ap_hs20_terms_and_conditions_sql(dev, apdev, params):
                    "ca_cert": "auth_serv/ca.pem",
                    "server_cert": "auth_serv/server.pem",
                    "private_key": "auth_serv/server.key" }
+        params['hs20_t_c_server_url'] = 'https://example.com/t_and_c?addr=@1@&ap=123'
         hostapd.add_ap(apdev[1], params)
 
         bssid = apdev[0]['bssid']
@@ -5890,7 +5890,6 @@ def test_ap_hs20_terms_and_conditions_sql(dev, apdev, params):
         params['auth_server_port'] = "18128"
         params['hs20_t_c_filename'] = 'terms-and-conditions'
         params['hs20_t_c_timestamp'] = '123456789'
-        params['hs20_t_c_server_url'] = 'https://example.com/t_and_c?addr=@1@&ap=123'
         params['own_ip_addr'] = "127.0.0.1"
         params['radius_das_port'] = "3799"
         params['radius_das_client'] = "127.0.0.1 secret"