From 4bfc794a37200f5d9c06ad435d2f1802e1526db5 Mon Sep 17 00:00:00 2001
From: James Prestwood <prestwoj@gmail.com>
Date: Mon, 13 May 2024 11:00:42 -0700
Subject: [PATCH] auto-t: remove default group SAE test for specific OUI

There are already tests for UseDefaultEccGroup and this test is
not longer valid as the static OUI list has been removed.
---
 autotests/testSAE/connection_test.py         |  7 -------
 autotests/testSAE/hw.conf                    |  3 +--
 autotests/testSAE/ssidSAE-default-group.conf | 12 ------------
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 autotests/testSAE/ssidSAE-default-group.conf

diff --git a/autotests/testSAE/connection_test.py b/autotests/testSAE/connection_test.py
index f7776385..107daa55 100644
--- a/autotests/testSAE/connection_test.py
+++ b/autotests/testSAE/connection_test.py
@@ -52,12 +52,6 @@ class Test(unittest.TestCase):
         self.hostapd.wait_for_event("AP-ENABLED")
         self.validate_connection(self.wd, "ssidSAE", self.hostapd, 19)
 
-    def test_SAE_force_group_19(self):
-        # Vendor data from APs which require group 19 be used first
-        self.hostapd.reload()
-        self.hostapd.wait_for_event("AP-ENABLED")
-        self.validate_connection(self.wd, "ssidSAE-default-group", self.hostapd_defgroup, 19)
-
     def test_SAE_Group20(self):
         self.hostapd.set_value('sae_groups', '20')
         self.hostapd.reload()
@@ -88,7 +82,6 @@ class Test(unittest.TestCase):
     def setUpClass(cls):
         cls.hostapd = HostapdCLI(config='ssidSAE.conf')
         cls.hostapd_h2e = HostapdCLI(config='ssidSAE-H2E.conf')
-        cls.hostapd_defgroup = HostapdCLI(config='ssidSAE-default-group.conf')
 
     @classmethod
     def tearDownClass(cls):
diff --git a/autotests/testSAE/hw.conf b/autotests/testSAE/hw.conf
index 127bbb31..cc0836b7 100644
--- a/autotests/testSAE/hw.conf
+++ b/autotests/testSAE/hw.conf
@@ -1,9 +1,8 @@
 [SETUP]
-num_radios=4
+num_radios=3
 start_iwd=0
 hwsim_medium=yes
 
 [HOSTAPD]
 rad0=ssidSAE.conf
 rad1=ssidSAE-H2E.conf
-rad2=ssidSAE-default-group.conf
diff --git a/autotests/testSAE/ssidSAE-default-group.conf b/autotests/testSAE/ssidSAE-default-group.conf
deleted file mode 100644
index 752e9c7b..00000000
--- a/autotests/testSAE/ssidSAE-default-group.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidSAE-default-group
-
-wpa=2
-wpa_key_mgmt=SAE
-wpa_pairwise=CCMP
-sae_password=secret123
-sae_groups=19
-ieee80211w=2
-sae_pwe=0
-vendor_elements=dd0cf4f5e8050500000000000000