Merge "Moving CC version to constants file"
am: 802838a59e
Change-Id: I88c0fc6a33b5f9003801fdaa420f0b2e52d5a63d
diff --git a/acts/framework/acts/test_utils/tel/tel_defines.py b/acts/framework/acts/test_utils/tel/tel_defines.py
index 0441a0c..0152ce8 100644
--- a/acts/framework/acts/test_utils/tel/tel_defines.py
+++ b/acts/framework/acts/test_utils/tel/tel_defines.py
@@ -288,6 +288,10 @@
CAPABILITY_VOLTE_PROVISIONING = 'volte_provisioning'
CAPABILITY_VOLTE_OVERRIDE_WFC_PROVISIONING = 'volte_override_wfc_provisioning'
+# Carrier Config Versions
+VZW_CARRIER_CONFIG_VERSION = "29999999999.1"
+ATT_CARRIER_CONFIG_VERSION = "28888888888.1"
+
# Constant for operation direction
DIRECTION_MOBILE_ORIGINATED = "MO"
DIRECTION_MOBILE_TERMINATED = "MT"
diff --git a/acts/tests/google/tel/live/TelLiveNoQXDMLogTest.py b/acts/tests/google/tel/live/TelLiveNoQXDMLogTest.py
index c4784c3..c5fd347 100644
--- a/acts/tests/google/tel/live/TelLiveNoQXDMLogTest.py
+++ b/acts/tests/google/tel/live/TelLiveNoQXDMLogTest.py
@@ -33,6 +33,8 @@
from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_BOOT_COMPLETE
from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_CARRIERCONFIG_CHANGE
+from acts.test_utils.tel.tel_defines import VZW_CARRIER_CONFIG_VERSION
+from acts.test_utils.tel.tel_defines import ATT_CARRIER_CONFIG_VERSION
from acts.test_utils.tel.tel_lookup_tables import device_capabilities
from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
from acts.test_utils.tel.tel_test_utils import lock_lte_band_by_mds
@@ -420,8 +422,9 @@
"""
try:
cc_version_mapping = {
- 'vzw': "29999999999",
- 'att': "28888888888",
+ 'vzw': VZW_CARRIER_CONFIG_VERSION,
+ 'Verizon': VZW_CARRIER_CONFIG_VERSION,
+ 'att': ATT_CARRIER_CONFIG_VERSION,
}
result_flag = False
time_var = 1