From d745fbe24ef5e16908aaa68ae06e92c2aa4405b6 Mon Sep 17 00:00:00 2001
From: James Prestwood <prestwoj@gmail.com>
Date: Wed, 16 Sep 2020 12:39:45 -0700
Subject: [PATCH] auto-t: update EAP-PEAP-SIM test to use ofono

---
 autotests/misc/secrets/eap-user-peap-sim.text | 2 +-
 autotests/testEAP-PEAP-SIM/connection_test.py | 6 ++++++
 autotests/testEAP-PEAP-SIM/hw.conf            | 4 +---
 autotests/testEAP-PEAP-SIM/sim.db             | 2 +-
 autotests/testEAP-PEAP-SIM/sim.eap_user       | 2 +-
 autotests/testEAP-PEAP-SIM/sim_keys.conf      | 4 ----
 6 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 autotests/testEAP-PEAP-SIM/sim_keys.conf

diff --git a/autotests/misc/secrets/eap-user-peap-sim.text b/autotests/misc/secrets/eap-user-peap-sim.text
index b3875a5c..76820116 100644
--- a/autotests/misc/secrets/eap-user-peap-sim.text
+++ b/autotests/misc/secrets/eap-user-peap-sim.text
@@ -1,4 +1,4 @@
 # Phase 1 users
 *	PEAP
 # Phase 2
-"132010000000000@example.com"	SIM	[2]
+"112345678@phonesim.org"	SIM	[2]
diff --git a/autotests/testEAP-PEAP-SIM/connection_test.py b/autotests/testEAP-PEAP-SIM/connection_test.py
index e4f03dc2..37398c15 100644
--- a/autotests/testEAP-PEAP-SIM/connection_test.py
+++ b/autotests/testEAP-PEAP-SIM/connection_test.py
@@ -9,6 +9,7 @@ import iwd
 from iwd import IWD
 from iwd import NetworkType
 from hlrauc import AuthCenter
+from ofono import Ofono
 
 class Test(unittest.TestCase):
     def validate_connection(self, wd):
@@ -44,6 +45,11 @@ class Test(unittest.TestCase):
 
     def test_connection_success(self):
         auth = AuthCenter('/tmp/hlrauc.sock', '/tmp/sim.db')
+
+        ofono = Ofono()
+        ofono.enable_modem('/phonesim')
+        ofono.wait_for_sim_auth()
+
         wd = IWD(True)
 
         try:
diff --git a/autotests/testEAP-PEAP-SIM/hw.conf b/autotests/testEAP-PEAP-SIM/hw.conf
index f98429f4..659ba0e0 100644
--- a/autotests/testEAP-PEAP-SIM/hw.conf
+++ b/autotests/testEAP-PEAP-SIM/hw.conf
@@ -1,9 +1,7 @@
 [SETUP]
 num_radios=2
 start_iwd=0
-max_test_exec_interval_sec=60
-tmpfs_extra_stuff=sim.eap_user:sim.db:sim_keys.conf:../misc/certs:../misc/secrets
-sim_keys=/tmp/sim_keys.conf
+sim_keys=ofono
 
 [HOSTAPD]
 rad0=ssidEAP-PEAP-SIM.conf
diff --git a/autotests/testEAP-PEAP-SIM/sim.db b/autotests/testEAP-PEAP-SIM/sim.db
index b7f51e66..fbf79786 100644
--- a/autotests/testEAP-PEAP-SIM/sim.db
+++ b/autotests/testEAP-PEAP-SIM/sim.db
@@ -1 +1 @@
-32010000000000:D0D1D2D3D4D5D6D7:E1E2E3E4:DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+12345678:673fb8cd35f98800:1fb1e3b5:DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
diff --git a/autotests/testEAP-PEAP-SIM/sim.eap_user b/autotests/testEAP-PEAP-SIM/sim.eap_user
index 17f7e1ae..dabb81a8 100644
--- a/autotests/testEAP-PEAP-SIM/sim.eap_user
+++ b/autotests/testEAP-PEAP-SIM/sim.eap_user
@@ -1 +1 @@
-"132010000000000@example.com"	SIM
+"112345678@phonesim.org"	SIM
diff --git a/autotests/testEAP-PEAP-SIM/sim_keys.conf b/autotests/testEAP-PEAP-SIM/sim_keys.conf
deleted file mode 100644
index 000760ad..00000000
--- a/autotests/testEAP-PEAP-SIM/sim_keys.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[SIM]
-Identity=32010000000000@example.com
-Kc=d0d1d2d3d4d5d6d7d0d1d2d3d4d5d6d7d0d1d2d3d4d5d6d7
-SRES=e1e2e3e4e1e2e3e4e1e2e3e4