Merge "Refactor: clean up unused and replicated code."
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_pdcch_power_test.py b/acts_tests/acts_contrib/test_utils/power/cellular/cellular_pdcch_power_test.py
index aef8e33..6f4f041 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_pdcch_power_test.py
+++ b/acts_tests/acts_contrib/test_utils/power/cellular/cellular_pdcch_power_test.py
@@ -15,7 +15,6 @@
# limitations under the License.
import os
-from acts import context
import acts_contrib.test_utils.power.cellular.cellular_power_base_test as base_test
@@ -24,23 +23,6 @@
In this test the UE is only listening and decoding the PDCCH channel. """
- # ODPM report
- ODPM_MODEM_RECORD_NAME = '[VSYS_PWR_MODEM]:Modem'
-
- # conversion unit
- S_TO_MS_FACTOR = 1000
-
- # kibble report
- KIBBLE_SYSTEM_RECORD_NAME = '- name: default_device.C10_EVT_1_1.Monsoon:mA'
-
- # params key
- MONSOON_VOLTAGE_KEY = 'mon_voltage'
-
- def __init__(self, controllers):
- super().__init__(controllers)
- self.odpm_power = 0
- self.kibble_system_power = 0
-
def power_pdcch_test(self):
""" Measures power during PDCCH only.
@@ -52,61 +34,5 @@
# Measure power
self.collect_power_data()
- # getting ODPM modem power value
- context_path = context.get_current_context().get_full_output_path()
- self.log.debug(
- 'class PowerTelPDCCHTest context path: ' + context_path
- )
- odpm_path = os.path.join(context_path, '../../odpm')
- self.log.debug('opdm path: ' + odpm_path)
- self.log.debug('ODPM list files: ')
- self.log.debug(os.listdir(odpm_path))
-
- elapsed_time = None
- for file in os.listdir(odpm_path):
- if 'after' in file and self.test_name in file:
- file_path = os.path.join(odpm_path, file)
- with open(file_path, 'r') as f:
- for line in f:
- if 'Elapsed time' in line:
- # time elapsed in mS
- # between 2 adb OPDM cmd
- elapsed_time = line.split(':')[1].strip().split(' ')[0]
- self.log.info('ODPM elapsed time: ' + elapsed_time)
- if self.ODPM_MODEM_RECORD_NAME in line:
- # change in cumulative enery in mWs
- # between 2 adb OPDM cmd
- delta_start_idx = line.index('(')
- delta_str = line[delta_start_idx+1:-2].strip()
- self.log.info(
- self.ODPM_MODEM_RECORD_NAME
- + ' delta: '
- + delta_str
- + ' mWs'
- )
- # calculate OPDM power
- elapsed_time_s = float(elapsed_time) / self.S_TO_MS_FACTOR
- odpm_power = float(delta_str) / elapsed_time_s
- self.odpm_power = odpm_power
- self.log.info(
- 'odpm power: ' + str(odpm_power) + ' mW'
- )
- # getting system power if kibble is on
- test_run_debug_log_path = os.path.join(
- context_path, 'test_run_debug.txt'
- )
- self.log.debug('test_run_debug path: ' + test_run_debug_log_path)
- with open(test_run_debug_log_path, 'r') as f:
- while True:
- line = f.readline()
- if not line:
- break
- if self.KIBBLE_SYSTEM_RECORD_NAME in line:
- value_line = f.readline()
- system_power_str = value_line.split(':')[1].strip()
- monsoon_voltage = self.test_params[self.MONSOON_VOLTAGE_KEY]
- self.kibble_system_power = float(system_power_str) * monsoon_voltage
- break
-
# Check if power measurement is within the required values
self.pass_fail_check(self.avg_current)
diff --git a/acts_tests/tests/google/power/tel/PowerTelPdcch_Preset_Test.py b/acts_tests/tests/google/power/tel/PowerTelPdcch_Preset_Test.py
index b1b8786..1ee069a 100644
--- a/acts_tests/tests/google/power/tel/PowerTelPdcch_Preset_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelPdcch_Preset_Test.py
@@ -17,62 +17,6 @@
class PowerTelPdcch_Preset_Test(cppt.PowerTelPDCCHTest):
-
- # Key for custom_property in Sponge
- CUSTOM_PROP_KEY_BUILD_ID = 'build_id'
- CUSTOM_PROP_KEY_INCR_BUILD_ID = 'incremental_build_id'
- CUSTOM_PROP_KEY_BUILD_TYPE = 'build_type'
- CUSTOM_PROP_KEY_SYSTEM_POWER = 'system_power'
- CUSTOM_PROP_KEY_MODEM_BASEBAND = 'baseband'
- CUSTOM_PROP_KEY_MODEM_ODPM_POWER = 'modem_opdm_power'
- CUSTOM_PROP_KEY_DEVICE_NAME = 'device'
- CUSTOM_PROP_KEY_DEVICE_BUILD_PHASE = 'device_build_phase'
- CUSTOM_PROP_KEY_MODEM_KIBBLE_POWER = 'modem_kibble_power'
-
- def teardown_test(self):
- super().teardown_test()
-
- # build info
- build_info = self.cellular_dut.ad.build_info
- build_id = build_info.get('build_id', 'Unknown')
- incr_build_id = build_info.get('incremental_build_id', 'Unknown')
- modem_base_band = self.cellular_dut.ad.adb.getprop(
- 'gsm.version.baseband')
- build_type = build_info.get('build_type', 'Unknown')
-
- # device info
- device_info = self.cellular_dut.ad.device_info
- device_name = device_info.get('model', 'Unknown')
- device_build_phase = self.cellular_dut.ad.adb.getprop(
- 'ro.boot.hardware.revision')
-
- # power measurement results
- odpm_power = self.odpm_power
- system_power = None
- modem_kibble_power = None
-
- # check if test is running with bits
- if hasattr(self, 'bitses'):
- modem_kibble_power = self.power_results.get(self.test_name, None)
- system_power = self.kibble_system_power
- else:
- system_power = self.power_results.get(self.test_name, None)
-
- self.record_data({
- 'Test Name': self.test_name,
- 'sponge_properties': {
- self.CUSTOM_PROP_KEY_SYSTEM_POWER: system_power,
- self.CUSTOM_PROP_KEY_BUILD_ID: build_id,
- self.CUSTOM_PROP_KEY_INCR_BUILD_ID: incr_build_id,
- self.CUSTOM_PROP_KEY_MODEM_BASEBAND: modem_base_band,
- self.CUSTOM_PROP_KEY_BUILD_TYPE: build_type,
- self.CUSTOM_PROP_KEY_MODEM_ODPM_POWER: odpm_power,
- self.CUSTOM_PROP_KEY_DEVICE_NAME: device_name,
- self.CUSTOM_PROP_KEY_DEVICE_BUILD_PHASE: device_build_phase,
- self.CUSTOM_PROP_KEY_MODEM_KIBBLE_POWER: modem_kibble_power
- },
- })
-
def test_preset_sa_pdcch(self):
self.power_pdcch_test()
diff --git a/acts_tests/tests/google/power/tel/PowerTelTraffic_Preset_Test.py b/acts_tests/tests/google/power/tel/PowerTelTraffic_Preset_Test.py
index e5b2eca..ee30986 100644
--- a/acts_tests/tests/google/power/tel/PowerTelTraffic_Preset_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelTraffic_Preset_Test.py
@@ -19,25 +19,21 @@
class PowerTelTrafficPresetTest(PWCEL.PowerCellularLabBaseTest):
# command to start iperf server on UE
START_IPERF_SV_UE_CMD = 'nohup > /dev/null 2>&1 sh -c "iperf3 -s -i1 -p5201 > /dev/null &"'
+
# command to start iperf server on UE
# (require: 1.path to iperf exe 2.hostname/hostIP)
START_IPERF_CLIENT_UE_CMD = (
'nohup > /dev/null 2>&1 sh -c '
'"iperf3 -c {iperf_host_ip} -i1 -p5202 -w8m -t2000 > /dev/null &"')
+
#command to start iperf server on host()
START_IPERF_SV_HOST_CMD = '{exe_path}\\iperf3 -s -p5202'
+
# command to start iperf client on host
# (require: 1.path to iperf exe 2.UE IP)
START_IPERF_CLIENT_HOST_CMD = (
'{exe_path}\\iperf3 -c {ue_ip} -w16M -t1000 -p5201')
- # Key for custom_property in Sponge
- CUSTOM_PROP_KEY_BUILD_ID = 'build_id'
- CUSTOM_PROP_KEY_INCR_BUILD_ID = 'incremental_build_id'
- CUSTOM_PROP_KEY_BUILD_TYPE = 'build_type'
- CUSTOM_PROP_KEY_POWER_MEASURE = 'power_measure'
- CUSTOM_PROP_KEY_MODEM_BASEBAND = 'baseband'
-
def __init__(self, controllers):
super().__init__(controllers)
self.ssh_iperf_client = None
@@ -70,35 +66,6 @@
self.ssh_iperf_client = self._create_ssh_client()
self.ssh_iperf_server = self._create_ssh_client()
- def teardown_test(self):
- """Tear down necessary objects after test case is finished. """
- super().teardown_test()
-
- # close ssh connection
- if self.ssh_iperf_server:
- self.ssh_iperf_server.close()
- if self.ssh_iperf_client:
- self.ssh_iperf_client.close()
-
- # write result to sponge
- build_info = self.cellular_dut.ad.build_info
- build_id = build_info.get('build_id', 'Unknown')
- incr_build_id = build_info.get('incremental_build_id', 'Unknown')
- modem_base_band = self.cellular_dut.ad.adb.getprop(
- 'gsm.version.baseband')
- build_type = build_info.get('build_type', 'Unknown')
- power_measure = self.power_results.get(self.test_name, None)
- self.record_data({
- 'Test Name': self.test_name,
- 'sponge_properties': {
- self.CUSTOM_PROP_KEY_POWER_MEASURE: power_measure,
- self.CUSTOM_PROP_KEY_BUILD_ID: build_id,
- self.CUSTOM_PROP_KEY_INCR_BUILD_ID: incr_build_id,
- self.CUSTOM_PROP_KEY_MODEM_BASEBAND: modem_base_band,
- self.CUSTOM_PROP_KEY_BUILD_TYPE: build_type
- },
- })
-
def power_tel_traffic_test(self):
"""Measure power while data is transferring."""
# Start data traffic
