Moving cellular simulations library to the controllers package

This will keep simulations and simulator classes in the same package.

Bug: 167211745

Change-Id: If75bc05cd4219763eafe36417c2597e37127ea1d

14 files changed, 17 insertions, 17 deletions

diff --git a/acts/framework/acts/controllers/anritsu_lib/md8475_cellular_simulator.py b/acts/framework/acts/controllers/anritsu_lib/md8475_cellular_simulator.py
index 98a779a89f..eea1c8a291 100644
--- a/acts/framework/acts/controllers/anritsu_lib/md8475_cellular_simulator.py
+++ b/acts/framework/acts/controllers/anritsu_lib/md8475_cellular_simulator.py
@@ -18,7 +18,7 @@ import math
 import ntpath
 import time
 import acts.controllers.cellular_simulator as cc
-from acts.test_utils.power.tel_simulations import LteSimulation
+from acts.controllers.cellular_lib import LteSimulation
 from acts.controllers.anritsu_lib import md8475a
 from acts.controllers.anritsu_lib import _anritsu_utils as anritsu
 
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/BaseSimulation.py b/acts/framework/acts/controllers/cellular_lib/BaseSimulation.py
index 7d38caeb95..7d38caeb95 100644
--- a/acts/framework/acts/test_utils/power/tel_simulations/BaseSimulation.py
+++ b/acts/framework/acts/controllers/cellular_lib/BaseSimulation.py
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/GsmSimulation.py b/acts/framework/acts/controllers/cellular_lib/GsmSimulation.py
index 6dc2082cd6..d275cae208 100644
--- a/acts/framework/acts/test_utils/power/tel_simulations/GsmSimulation.py
+++ b/acts/framework/acts/controllers/cellular_lib/GsmSimulation.py
@@ -20,7 +20,7 @@ import time
 from acts.controllers.anritsu_lib.md8475a import BtsGprsMode
 from acts.controllers.anritsu_lib.md8475a import BtsNumber
 from acts.controllers.anritsu_lib import md8475_cellular_simulator as anritsusim
-from acts.test_utils.power.tel_simulations.BaseSimulation import BaseSimulation
+from acts.controllers.cellular_lib.BaseSimulation import BaseSimulation
 from acts.test_utils.tel.anritsu_utils import GSM_BAND_DCS1800
 from acts.test_utils.tel.anritsu_utils import GSM_BAND_EGSM900
 from acts.test_utils.tel.anritsu_utils import GSM_BAND_GSM850
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/LteCaSimulation.py b/acts/framework/acts/controllers/cellular_lib/LteCaSimulation.py
index addc3a8aab..26f6e43d07 100644
--- a/acts/framework/acts/test_utils/power/tel_simulations/LteCaSimulation.py
+++ b/acts/framework/acts/controllers/cellular_lib/LteCaSimulation.py
@@ -14,7 +14,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 import re
-from acts.test_utils.power.tel_simulations import LteSimulation
+from acts.controllers.cellular_lib import LteSimulation
 
 
 class LteCaSimulation(LteSimulation.LteSimulation):
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/LteImsSimulation.py b/acts/framework/acts/controllers/cellular_lib/LteImsSimulation.py
index 71102463cf..e13eb297ba 100644
--- a/acts/framework/acts/test_utils/power/tel_simulations/LteImsSimulation.py
+++ b/acts/framework/acts/controllers/cellular_lib/LteImsSimulation.py
@@ -13,7 +13,7 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
-from acts.test_utils.power.tel_simulations.LteSimulation import LteSimulation
+from acts.controllers.cellular_lib.LteSimulation import LteSimulation
 import acts.test_utils.tel.anritsu_utils as anritsu_utils
 import acts.controllers.anritsu_lib.md8475a as md8475a
 
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/LteSimulation.py b/acts/framework/acts/controllers/cellular_lib/LteSimulation.py
index 44bcbf67dd..b4c84bb703 100644
--- a/acts/framework/acts/test_utils/power/tel_simulations/LteSimulation.py
+++ b/acts/framework/acts/controllers/cellular_lib/LteSimulation.py
@@ -17,7 +17,7 @@
 import math
 from enum import Enum
 
-from acts.test_utils.power.tel_simulations.BaseSimulation import BaseSimulation
+from acts.controllers.cellular_lib.BaseSimulation import BaseSimulation
 from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_ONLY
 
 
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/UmtsSimulation.py b/acts/framework/acts/controllers/cellular_lib/UmtsSimulation.py
index 4d4aeebf8b..4a2619cf58 100644
--- a/acts/framework/acts/test_utils/power/tel_simulations/UmtsSimulation.py
+++ b/acts/framework/acts/controllers/cellular_lib/UmtsSimulation.py
@@ -20,7 +20,7 @@ import time
 from acts.controllers.anritsu_lib import md8475_cellular_simulator as anritsusim
 from acts.controllers.anritsu_lib.md8475a import BtsNumber
 from acts.controllers.anritsu_lib.md8475a import BtsPacketRate
-from acts.test_utils.power.tel_simulations.BaseSimulation import BaseSimulation
+from acts.controllers.cellular_lib.BaseSimulation import BaseSimulation
 from acts.test_utils.tel.tel_defines import NETWORK_MODE_WCDMA_ONLY
 
 
diff --git a/acts/framework/acts/test_utils/power/tel_simulations/__init__.py b/acts/framework/acts/controllers/cellular_lib/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/acts/framework/acts/test_utils/power/tel_simulations/__init__.py
+++ b/acts/framework/acts/controllers/cellular_lib/__init__.py
diff --git a/acts/framework/acts/controllers/cellular_simulator.py b/acts/framework/acts/controllers/cellular_simulator.py
index 2408611996..99adbd87be 100644
--- a/acts/framework/acts/controllers/cellular_simulator.py
+++ b/acts/framework/acts/controllers/cellular_simulator.py
@@ -14,7 +14,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 from acts import logger
-from acts.test_utils.power import tel_simulations as sims
+from acts.controllers import cellular_lib as sims
 
 
 class AbstractCellularSimulator:
diff --git a/acts/framework/acts/controllers/rohdeschwarz_lib/cmw500_cellular_simulator.py b/acts/framework/acts/controllers/rohdeschwarz_lib/cmw500_cellular_simulator.py
index 91e71b767a..6a6c3ffd0a 100644
--- a/acts/framework/acts/controllers/rohdeschwarz_lib/cmw500_cellular_simulator.py
+++ b/acts/framework/acts/controllers/rohdeschwarz_lib/cmw500_cellular_simulator.py
@@ -17,7 +17,7 @@ import time
 
 from acts.controllers.rohdeschwarz_lib import cmw500
 from acts.controllers import cellular_simulator as cc
-from acts.test_utils.power.tel_simulations import LteSimulation
+from acts.controllers.cellular_lib import LteSimulation
 
 CMW_TM_MAPPING = {
     LteSimulation.TransmissionMode.TM1: cmw500.TransmissionModes.TM1,
diff --git a/acts/framework/acts/test_utils/power/cellular/cellular_power_base_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_power_base_test.py
index 6ffc7843b9..9fe7fd1301 100644
--- a/acts/framework/acts/test_utils/power/cellular/cellular_power_base_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_power_base_test.py
@@ -21,11 +21,11 @@ import acts.controllers.cellular_simulator as simulator
 from acts.controllers.anritsu_lib import md8475_cellular_simulator as anritsu
 from acts.controllers.rohdeschwarz_lib import cmw500_cellular_simulator as cmw
 from acts.controllers.rohdeschwarz_lib import cmx500_cellular_simulator as cmx
-from acts.test_utils.power.tel_simulations.GsmSimulation import GsmSimulation
-from acts.test_utils.power.tel_simulations.LteSimulation import LteSimulation
-from acts.test_utils.power.tel_simulations.UmtsSimulation import UmtsSimulation
-from acts.test_utils.power.tel_simulations.LteCaSimulation import LteCaSimulation
-from acts.test_utils.power.tel_simulations.LteImsSimulation import LteImsSimulation
+from acts.controllers.cellular_lib.GsmSimulation import GsmSimulation
+from acts.controllers.cellular_lib.LteSimulation import LteSimulation
+from acts.controllers.cellular_lib.UmtsSimulation import UmtsSimulation
+from acts.controllers.cellular_lib.LteCaSimulation import LteCaSimulation
+from acts.controllers.cellular_lib.LteImsSimulation import LteImsSimulation
 from acts.test_utils.tel import tel_test_utils as telutils
 
 
diff --git a/acts/framework/tests/test_utils/power/tel/lab/init_simulation_test.py b/acts/framework/tests/test_utils/power/tel/lab/init_simulation_test.py
index 1bd2f074fc..24fe91a457 100644
--- a/acts/framework/tests/test_utils/power/tel/lab/init_simulation_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/init_simulation_test.py
@@ -17,8 +17,8 @@
 import unittest
 import mobly.config_parser as mobly_config_parser
 import mock_bokeh
-from acts.test_utils.power.tel_simulations.LteSimulation import LteSimulation
-from acts.test_utils.power.tel_simulations.UmtsSimulation import UmtsSimulation
+from acts.controllers.cellular_lib.LteSimulation import LteSimulation
+from acts.controllers.cellular_lib.UmtsSimulation import UmtsSimulation
 from unittest import mock
 
 
diff --git a/acts/framework/tests/test_utils/power/tel/lab/power_tel_traffic_e2e_test.py b/acts/framework/tests/test_utils/power/tel/lab/power_tel_traffic_e2e_test.py
index ff9599665f..065543ff1e 100644
--- a/acts/framework/tests/test_utils/power/tel/lab/power_tel_traffic_e2e_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/power_tel_traffic_e2e_test.py
@@ -18,7 +18,7 @@ import unittest
 import mock_bokeh
 import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
 import mobly.config_parser as mobly_config_parser
-from acts.test_utils.power.tel_simulations.LteSimulation import LteSimulation
+from acts.controllers.cellular_lib.LteSimulation import LteSimulation
 from acts.controllers.rohdeschwarz_lib import cmw500_cellular_simulator as cmw
 from unittest import mock
 
diff --git a/acts/framework/tests/test_utils/power/tel/lab/save_summary_to_file_test.py b/acts/framework/tests/test_utils/power/tel/lab/save_summary_to_file_test.py
index 1e1554a0dc..900c3a74da 100644
--- a/acts/framework/tests/test_utils/power/tel/lab/save_summary_to_file_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/save_summary_to_file_test.py
@@ -17,7 +17,7 @@
 import unittest
 import mobly.config_parser as mobly_config_parser
 import mock_bokeh
-from acts.test_utils.power.tel_simulations.LteSimulation import LteSimulation
+from acts.controllers.cellular_lib.LteSimulation import LteSimulation
 from unittest import mock
 from unittest.mock import mock_open