commit 6dc6e4e6bd9fadae7ba5511f0196206e74748ed9
author Markus Liu <markusliu@google.com> Mon Nov 29 20:22:28 2021 +0800
committer Markus Liu <markusliu@google.com> Tue Nov 30 10:55:40 2021 +0800
tree 75bd27df88e74ba77931413562c0b20e39581947
parent 893cf3daac9fdda7397039df8b88749a98af5778

Move get_slot_index_from_subid to tel_subscription_utils

Bug: None
Test: Yes, locally
Change-Id: I8e292e907ef8b15116cf391c5bac09f06313aed9

acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py

diff --git a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py
index 01c2b32..37513a0 100644
--- a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py
@@ -21,19 +21,19 @@
 from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
 from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
 from acts_contrib.test_utils.tel.tel_subscription_utils import get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
 from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
+from acts_contrib.test_utils.tel.tel_subscription_utils import get_slot_index_from_subid
+from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_on_same_network_of_host_ad
 from acts_contrib.test_utils.tel.tel_subscription_utils import set_message_subid
 from acts_contrib.test_utils.tel.tel_subscription_utils import set_voice_sub_id
 from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_on_same_network_of_host_ad
 from acts_contrib.test_utils.tel.tel_message_utils import log_messaging_screen_shot
 from acts_contrib.test_utils.tel.tel_message_utils import sms_in_collision_send_receive_verify_for_subscription
 from acts_contrib.test_utils.tel.tel_message_utils import sms_rx_power_off_multiple_send_receive_verify_for_subscription
 from acts_contrib.test_utils.tel.tel_message_utils import voice_call_in_collision_with_mt_sms_msim
 from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
 from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import get_slot_index_from_subid
 from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_on_rat
 from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
 from acts_contrib.test_utils.tel.tel_dsds_utils import dsds_message_test
@@ -196,7 +196,7 @@
         _, mt_voice_sub_id, _ = get_subid_on_same_network_of_host_ad(ads)
         set_voice_sub_id(ad_mt_voice, mt_voice_sub_id)
         ad_mt_voice.log.info("Sub ID for incoming call at slot %s: %s",
-            get_slot_index_from_subid(self.log, ad_mt_voice, mt_voice_sub_id),
+            get_slot_index_from_subid(ad_mt_voice, mt_voice_sub_id),
             get_incoming_voice_sub_id(ad_mt_voice))
 
         set_message_subid(
@@ -284,7 +284,7 @@
                 mo_voice_slot,
                 ad_mt_voice.serial,
                 get_slot_index_from_subid(
-                    self.log, ad_mt_voice, mt_voice_sub_id))
+                    ad_mt_voice, mt_voice_sub_id))
             extras = {"call_fail_reason": str(result.result_value)}
 
         if not sms_result or not call_result: