diff options
| author | Ignacio Guarna <iguarna@google.com> | 2019-09-04 22:11:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-04 22:11:40 -0700 |
| commit | ed8e7d5ceaab6cc46ac335f625b56d649458a57b (patch) | |
| tree | cd569ffcd5c3b7c21b6ba8c9269706db9e7d62ae | |
| parent | 0bf0cfa06376a61093cb39106487e56f396e0ed8 (diff) | |
| parent | 83b0665f1c4239b70d5771840ac169d05ea64120 (diff) | |
| download | connectivity-temp_140451723.tar.gz | |
Merge "Set bandwidth to the maximum allowed value during calibration"temp_140451723
am: 83b0665f1c
Change-Id: Idaf24458020d4e5343c79cfaad29c7dfb7be8f9c
| -rw-r--r-- | acts/framework/acts/test_utils/power/tel_simulations/LteSimulation.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/LteSimulation.py b/acts/framework/acts/test_utils/power/tel_simulations/LteSimulation.py index a7281fbe4..9aa6dde1e 100644 --- a/acts/framework/acts/test_utils/power/tel_simulations/LteSimulation.py +++ b/acts/framework/acts/test_utils/power/tel_simulations/LteSimulation.py @@ -1563,10 +1563,8 @@ class LteSimulation(BaseSimulation): def calibrate(self): """ Calculates UL and DL path loss if it wasn't done before - This method overrides the baseclass specifically for LTE calibration. - For LTE cal, the simulation is set to TM1 and 1 antenna. - - """ + Before running the base class implementation, configure the base station + to only use one downlink antenna with maximum bandwidth. """ # Set in TM1 mode and 1 antenna for downlink calibration for LTE init_dl_antenna = None @@ -1578,15 +1576,25 @@ class LteSimulation(BaseSimulation): self.bts1.transmode = "TM1" time.sleep(5) # It takes some time to propagate the new settings + # Save bandwidth value so it can be restored after calibration + init_bandwidth = self.get_bandwidth(self.bts1) + + # Set bandwidth to the maximum allowed value during calibration + self.set_channel_bandwidth( + self.bts1, + max(self.allowed_bandwidth_dictionary[int(self.bts1.band)])) + # SET TBS pattern for calibration self.bts1.tbs_pattern = "FULLALLOCATION" if self.tbs_pattern_on else "OFF" super().calibrate() + # Restore values as they were before changing them for calibration. if init_dl_antenna is not None: self.bts1.dl_antenna = init_dl_antenna self.bts1.transmode = init_transmode time.sleep(5) # It takes some time to propagate the new settings + self.set_channel_bandwidth(self.bts1, init_bandwidth) def start_traffic_for_calibration(self): """ |