From d848ec9194329c056652c07e04e25113d7f78e8d Mon Sep 17 00:00:00 2001
From: Lei PAN <panleicim@gmail.com>
Date: Sun, 17 Apr 2022 19:28:38 +0200
Subject: [PATCH] try to test performance

---
 logs/AppLogging.py  |  2 +-
 modems/ModemPool.py | 10 +++----
 params.py           | 70 +++++++++++++++++++++++----------------------
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/logs/AppLogging.py b/logs/AppLogging.py
index 0842f84..f4e8640 100644
--- a/logs/AppLogging.py
+++ b/logs/AppLogging.py
@@ -9,4 +9,4 @@ def init_logger():
                         filemode='a',
                         format='%(asctime)s,%(msecs)d %(name)s %(levelname)s %(message)s',
                         datefmt='%Y-%m-%d %H:%M:%S',
-                        level=logging.INFO)
+                        level=logging.DEBUG)
diff --git a/modems/ModemPool.py b/modems/ModemPool.py
index d017a6c..7539672 100644
--- a/modems/ModemPool.py
+++ b/modems/ModemPool.py
@@ -20,6 +20,7 @@ class ModemPool:
         self._port_list = port_list
         self._serial_list = []
         self._excel_helper = ExcelHelper()
+        self.contacts = self._excel_helper.read_contacts("/contact_all.xlsx")
         self._log_sender = oracle_log_sender
         self._db_manager = firebase_store_manager
 
@@ -33,8 +34,8 @@ class ModemPool:
             # may encontre exception here, multi-access to serial port
             time.sleep(2)
             self._send_command("AT+CFUN=1,1\r", ser)
-        #     wait for 20 second, so that the modem can init all the sims
-        time.sleep(20)
+        #     wait for 10 second, so that the modem can init all the sims
+        time.sleep(10)
 
     def _generate_error_msg(self, slot_position, index, error: SIMError):
         msg = "slot({}) SIM({}), error:{}".format(slot_position, index + 1,
@@ -49,15 +50,14 @@ class ModemPool:
             position = (slot_position - 1) * len(self._port_list) + sim_position
             # unlock sim
             unlock_cmd = 'AT+CPIN="{0}\r"'.format("0000")
-            self._send_command(unlock_cmd, ser, 10)
+            self._send_command(unlock_cmd, ser, 30)
             cmd = "AT+CCID\r"
             response = str(self._send_command(cmd, ser))
             ccid_group = re.search("[0-9F]+", response)
             ccid = ccid_group.group(0)
             operator = check_operator(ccid)
             if operator == Operator.SFR or operator == Operator.CHINA_TELECOM:
-                contacts = self._excel_helper.read_contacts("/contact_all.xlsx")
-                contact = [contact for contact in contacts if
+                contact = [contact for contact in self.contacts if
                            contact.ccid.replace("F", "") == ccid.replace("F", "")]
                 if len(contact) > 0:
                     phone_number = contact[0].phone
diff --git a/params.py b/params.py
index a50328f..f67e7e7 100644
--- a/params.py
+++ b/params.py
@@ -4,41 +4,43 @@ from db.DbManager import DataManager
 from logs.LogSender import LogSender
 
 MODEM_POOL_PORTS = [
-    "/dev/tty.usbmodem1422101",
-    "/dev/tty.usbmodem1422103",
-    "/dev/tty.usbmodem1422105",
-    "/dev/tty.usbmodem1422107",
-    "/dev/tty.usbmodem1422201",
-    "/dev/tty.usbmodem1422203",
-    "/dev/tty.usbmodem1422205",
-    "/dev/tty.usbmodem1422207",
-    "/dev/tty.usbmodem1422301",
-    ## "/dev/tty.usbmodem1422303",
-    "/dev/tty.usbmodem1422305",
-    "/dev/tty.usbmodem1422307",
-    "/dev/tty.usbmodem1422401",
-    "/dev/tty.usbmodem1422403",
-    "/dev/tty.usbmodem1422405",
-    "/dev/tty.usbmodem1422407",
-    # modem 2
-    "/dev/tty.usbmodem1423101",
-    "/dev/tty.usbmodem1423103",
-    "/dev/tty.usbmodem1423105",
-    "/dev/tty.usbmodem1423107",
-    "/dev/tty.usbmodem1423201",
-    "/dev/tty.usbmodem1423203",
-    "/dev/tty.usbmodem1423205",
-    "/dev/tty.usbmodem1423207",
-    "/dev/tty.usbmodem1423301",
-    "/dev/tty.usbmodem1423303",
-    "/dev/tty.usbmodem1423305",
-    "/dev/tty.usbmodem1423307",
-    "/dev/tty.usbmodem1423401",
-    "/dev/tty.usbmodem1423403",
-    "/dev/tty.usbmodem1423405",
-    "/dev/tty.usbmodem1423407",
+    # modem 1
+    "/dev/tty.usbmodem1421101",
+    "/dev/tty.usbmodem1421103",
+    "/dev/tty.usbmodem1421105",
+    "/dev/tty.usbmodem1421107",
+    "/dev/tty.usbmodem1421201",
+    "/dev/tty.usbmodem1421203",
+    "/dev/tty.usbmodem1421205",
+    "/dev/tty.usbmodem1421207",
+    "/dev/tty.usbmodem1421301",
+    "/dev/tty.usbmodem1421303",
+    # "/dev/tty.usbmodem1421305",
+    "/dev/tty.usbmodem1421307",
+    "/dev/tty.usbmodem1421401",
+    "/dev/tty.usbmodem1421403",
+    "/dev/tty.usbmodem1421405",
+    "/dev/tty.usbmodem1421407",
+    # modem2
+    "/dev/tty.usbmodem14221101",
+    "/dev/tty.usbmodem14221103",
+    "/dev/tty.usbmodem14221105",
+    "/dev/tty.usbmodem14221107",
+    "/dev/tty.usbmodem14221201",
+    "/dev/tty.usbmodem14221203",
+    "/dev/tty.usbmodem14221205",
+    "/dev/tty.usbmodem14221207",
+    # "/dev/tty.usbmodem14221301",
+    ## "/dev/tty.usbmodem14221303",
+    # "/dev/tty.usbmodem14221305",
+    # "/dev/tty.usbmodem14221307",
+    # "/dev/tty.usbmodem14221401",
+    # "/dev/tty.usbmodem14221403",
+    # "/dev/tty.usbmodem14221405",
+    # "/dev/tty.usbmodem14221407",
+
 ]
-CARD_POOL_PORT = ["/dev/tty.usbmodem1422501", "/dev/tty.usbmodem1423601"]
+CARD_POOL_PORT = ["/dev/tty.usbmodem14221501", "/dev/tty.usbmodem1421601"]
 firebase_store_manager = DataManager()
 oracle_log_sender = LogSender()