Merge "Renames the ACTS_CONTROLLER_CONFIG_NAME to MOBLY_CONTROLLER_CONFIG_NAME."
diff --git a/acts/framework/acts/base_test.py b/acts/framework/acts/base_test.py
index 6afe290..7e45375 100755
--- a/acts/framework/acts/base_test.py
+++ b/acts/framework/acts/base_test.py
@@ -314,10 +314,7 @@
occurred in the registration process.
"""
module_ref_name = self.get_module_reference_name(controller_module)
-
- # Substitute Mobly controller's module config name with the ACTS one
- module_config_name = controller_module.ACTS_CONTROLLER_CONFIG_NAME
- controller_module.MOBLY_CONTROLLER_CONFIG_NAME = module_config_name
+ module_config_name = controller_module.MOBLY_CONTROLLER_CONFIG_NAME
# Get controller objects from Mobly's register_controller
controllers = self._controller_manager.register_controller(
diff --git a/acts/framework/acts/controllers/access_point.py b/acts/framework/acts/controllers/access_point.py
index b8209d4..b6eaa0d 100755
--- a/acts/framework/acts/controllers/access_point.py
+++ b/acts/framework/acts/controllers/access_point.py
@@ -34,7 +34,7 @@
from acts.controllers.utils_lib.ssh import settings
from acts.libs.proc import job
-ACTS_CONTROLLER_CONFIG_NAME = 'AccessPoint'
+MOBLY_CONTROLLER_CONFIG_NAME = 'AccessPoint'
ACTS_CONTROLLER_REFERENCE_NAME = 'access_points'
_BRCTL = 'brctl'
diff --git a/acts/framework/acts/controllers/android_device.py b/acts/framework/acts/controllers/android_device.py
index b4b7ca1..a932c7e 100755
--- a/acts/framework/acts/controllers/android_device.py
+++ b/acts/framework/acts/controllers/android_device.py
@@ -43,7 +43,7 @@
from acts.libs.proc import job
from acts.metrics.loggers.usage_metadata_logger import record_api_usage
-ACTS_CONTROLLER_CONFIG_NAME = "AndroidDevice"
+MOBLY_CONTROLLER_CONFIG_NAME = "AndroidDevice"
ACTS_CONTROLLER_REFERENCE_NAME = "android_devices"
ANDROID_DEVICE_PICK_ALL_TOKEN = "*"
diff --git a/acts/framework/acts/controllers/arduino_wifi_dongle.py b/acts/framework/acts/controllers/arduino_wifi_dongle.py
index 290466a..9fd88be 100644
--- a/acts/framework/acts/controllers/arduino_wifi_dongle.py
+++ b/acts/framework/acts/controllers/arduino_wifi_dongle.py
@@ -29,7 +29,7 @@
from acts import utils
from acts.test_utils.wifi import wifi_test_utils as wutils
-ACTS_CONTROLLER_CONFIG_NAME = 'ArduinoWifiDongle'
+MOBLY_CONTROLLER_CONFIG_NAME = 'ArduinoWifiDongle'
ACTS_CONTROLLER_REFERENCE_NAME = 'arduino_wifi_dongles'
WIFI_DONGLE_EMPTY_CONFIG_MSG = 'Configuration is empty, abort!'
diff --git a/acts/framework/acts/controllers/attenuator.py b/acts/framework/acts/controllers/attenuator.py
index 9d99c2d..ad5ad81 100644
--- a/acts/framework/acts/controllers/attenuator.py
+++ b/acts/framework/acts/controllers/attenuator.py
@@ -20,7 +20,7 @@
from acts.keys import Config
from acts.libs.proc import job
-ACTS_CONTROLLER_CONFIG_NAME = 'Attenuator'
+MOBLY_CONTROLLER_CONFIG_NAME = 'Attenuator'
ACTS_CONTROLLER_REFERENCE_NAME = 'attenuators'
_ATTENUATOR_OPEN_RETRIES = 3
diff --git a/acts/framework/acts/controllers/bluetooth_pts_device.py b/acts/framework/acts/controllers/bluetooth_pts_device.py
index b629108..917c1e4 100644
--- a/acts/framework/acts/controllers/bluetooth_pts_device.py
+++ b/acts/framework/acts/controllers/bluetooth_pts_device.py
@@ -68,7 +68,7 @@
pass
-ACTS_CONTROLLER_CONFIG_NAME = "BluetoothPtsDevice"
+MOBLY_CONTROLLER_CONFIG_NAME = "BluetoothPtsDevice"
ACTS_CONTROLLER_REFERENCE_NAME = "bluetooth_pts_device"
# Prefix to identify final verdict string. This is a PTS specific log String.
diff --git a/acts/framework/acts/controllers/buds_controller.py b/acts/framework/acts/controllers/buds_controller.py
index 853650c..8ce2098 100644
--- a/acts/framework/acts/controllers/buds_controller.py
+++ b/acts/framework/acts/controllers/buds_controller.py
@@ -22,7 +22,7 @@
from acts.controllers.buds_lib.apollo_lib import ParentDevice
-ACTS_CONTROLLER_CONFIG_NAME = 'BudsDevice'
+MOBLY_CONTROLLER_CONFIG_NAME = 'BudsDevice'
ACTS_CONTROLLER_REFERENCE_NAME = 'buds_devices'
diff --git a/acts/framework/acts/controllers/chameleon_controller.py b/acts/framework/acts/controllers/chameleon_controller.py
index fb6af02..b9965cf 100644
--- a/acts/framework/acts/controllers/chameleon_controller.py
+++ b/acts/framework/acts/controllers/chameleon_controller.py
@@ -21,7 +21,7 @@
from acts import signals
-ACTS_CONTROLLER_CONFIG_NAME = "ChameleonDevice"
+MOBLY_CONTROLLER_CONFIG_NAME = "ChameleonDevice"
ACTS_CONTROLLER_REFERENCE_NAME = "chameleon_devices"
CHAMELEON_DEVICE_EMPTY_CONFIG_MSG = "Configuration is empty, abort!"
diff --git a/acts/framework/acts/controllers/fuchsia_device.py b/acts/framework/acts/controllers/fuchsia_device.py
index c5c1ad0..e2c6e32 100644
--- a/acts/framework/acts/controllers/fuchsia_device.py
+++ b/acts/framework/acts/controllers/fuchsia_device.py
@@ -62,7 +62,7 @@
from acts.controllers.fuchsia_lib.wlan_policy_lib import FuchsiaWlanPolicyLib
from acts.libs.proc.job import Error
-ACTS_CONTROLLER_CONFIG_NAME = "FuchsiaDevice"
+MOBLY_CONTROLLER_CONFIG_NAME = "FuchsiaDevice"
ACTS_CONTROLLER_REFERENCE_NAME = "fuchsia_devices"
FUCHSIA_DEVICE_EMPTY_CONFIG_MSG = "Configuration is empty, abort!"
diff --git a/acts/framework/acts/controllers/iperf_client.py b/acts/framework/acts/controllers/iperf_client.py
index 6785f4e..4989e35 100644
--- a/acts/framework/acts/controllers/iperf_client.py
+++ b/acts/framework/acts/controllers/iperf_client.py
@@ -34,7 +34,7 @@
from acts.event.event import TestClassEndEvent
from acts.libs.proc import job
from paramiko.buffered_pipe import PipeTimeout
-ACTS_CONTROLLER_CONFIG_NAME = 'IPerfClient'
+MOBLY_CONTROLLER_CONFIG_NAME = 'IPerfClient'
ACTS_CONTROLLER_REFERENCE_NAME = 'iperf_clients'
diff --git a/acts/framework/acts/controllers/iperf_server.py b/acts/framework/acts/controllers/iperf_server.py
index 0e76d4c..2b7d970 100755
--- a/acts/framework/acts/controllers/iperf_server.py
+++ b/acts/framework/acts/controllers/iperf_server.py
@@ -34,7 +34,7 @@
from acts.event.event import TestClassEndEvent
from acts.libs.proc import job
-ACTS_CONTROLLER_CONFIG_NAME = 'IPerfServer'
+MOBLY_CONTROLLER_CONFIG_NAME = 'IPerfServer'
ACTS_CONTROLLER_REFERENCE_NAME = 'iperf_servers'
KILOBITS = 1024
MEGABITS = KILOBITS * 1024
diff --git a/acts/framework/acts/controllers/monsoon.py b/acts/framework/acts/controllers/monsoon.py
index 2728b06..bcec812 100644
--- a/acts/framework/acts/controllers/monsoon.py
+++ b/acts/framework/acts/controllers/monsoon.py
@@ -17,7 +17,7 @@
from acts.controllers.monsoon_lib.api.lvpm_stock.monsoon import \
Monsoon as LvpmStockMonsoon
-ACTS_CONTROLLER_CONFIG_NAME = 'Monsoon'
+MOBLY_CONTROLLER_CONFIG_NAME = 'Monsoon'
ACTS_CONTROLLER_REFERENCE_NAME = 'monsoons'
diff --git a/acts/framework/acts/controllers/native_android_device.py b/acts/framework/acts/controllers/native_android_device.py
index b65473e..6d38ee5 100644
--- a/acts/framework/acts/controllers/native_android_device.py
+++ b/acts/framework/acts/controllers/native_android_device.py
@@ -24,7 +24,7 @@
#TODO(tturney): Merge this into android device
-ACTS_CONTROLLER_CONFIG_NAME = "NativeAndroidDevice"
+MOBLY_CONTROLLER_CONFIG_NAME = "NativeAndroidDevice"
ACTS_CONTROLLER_REFERENCE_NAME = "native_android_devices"
diff --git a/acts/framework/acts/controllers/packet_capture.py b/acts/framework/acts/controllers/packet_capture.py
index d10ffad..1e6d96d 100755
--- a/acts/framework/acts/controllers/packet_capture.py
+++ b/acts/framework/acts/controllers/packet_capture.py
@@ -33,7 +33,7 @@
import threading
import time
-ACTS_CONTROLLER_CONFIG_NAME = 'PacketCapture'
+MOBLY_CONTROLLER_CONFIG_NAME = 'PacketCapture'
ACTS_CONTROLLER_REFERENCE_NAME = 'packet_capture'
BSS = 'BSS'
BSSID = 'BSSID'
@@ -102,7 +102,7 @@
self.ssh_settings = settings.from_config(configs['ssh_config'])
self.ssh = connection.SshConnection(self.ssh_settings)
self.log = logger.create_logger(lambda msg: '[%s|%s] %s' % (
- ACTS_CONTROLLER_CONFIG_NAME, self.ssh_settings.hostname, msg))
+ MOBLY_CONTROLLER_CONFIG_NAME, self.ssh_settings.hostname, msg))
self._create_interface(MON_2G, 'monitor')
self._create_interface(MON_5G, 'monitor')
diff --git a/acts/framework/acts/controllers/packet_sender.py b/acts/framework/acts/controllers/packet_sender.py
index 209fd54..e037e29 100644
--- a/acts/framework/acts/controllers/packet_sender.py
+++ b/acts/framework/acts/controllers/packet_sender.py
@@ -27,7 +27,7 @@
# On ubuntu, sudo pip3 install scapy
import scapy.all as scapy
-ACTS_CONTROLLER_CONFIG_NAME = 'PacketSender'
+MOBLY_CONTROLLER_CONFIG_NAME = 'PacketSender'
ACTS_CONTROLLER_REFERENCE_NAME = 'packet_senders'
GET_FROM_LOCAL_INTERFACE = 'get_local'
diff --git a/acts/framework/acts/controllers/pdu.py b/acts/framework/acts/controllers/pdu.py
index 7a65d21..6b2b75c 100644
--- a/acts/framework/acts/controllers/pdu.py
+++ b/acts/framework/acts/controllers/pdu.py
@@ -19,7 +19,7 @@
from acts import tracelogger
-ACTS_CONTROLLER_CONFIG_NAME = 'PduDevice'
+MOBLY_CONTROLLER_CONFIG_NAME = 'PduDevice'
ACTS_CONTROLLER_REFERENCE_NAME = 'pdu_devices'
diff --git a/acts/framework/acts/controllers/relay_device_controller.py b/acts/framework/acts/controllers/relay_device_controller.py
index 592e967..528e166 100644
--- a/acts/framework/acts/controllers/relay_device_controller.py
+++ b/acts/framework/acts/controllers/relay_device_controller.py
@@ -18,7 +18,7 @@
from acts.controllers.relay_lib.relay_rig import RelayRig
-ACTS_CONTROLLER_CONFIG_NAME = "RelayDevice"
+MOBLY_CONTROLLER_CONFIG_NAME = "RelayDevice"
ACTS_CONTROLLER_REFERENCE_NAME = "relay_devices"
diff --git a/acts/framework/acts/controllers/sniffer.py b/acts/framework/acts/controllers/sniffer.py
index fcd08f8..dab7e90 100644
--- a/acts/framework/acts/controllers/sniffer.py
+++ b/acts/framework/acts/controllers/sniffer.py
@@ -17,7 +17,7 @@
import importlib
import logging
-ACTS_CONTROLLER_CONFIG_NAME = "Sniffer"
+MOBLY_CONTROLLER_CONFIG_NAME = "Sniffer"
ACTS_CONTROLLER_REFERENCE_NAME = "sniffers"
diff --git a/acts/framework/tests/acts_base_class_test.py b/acts/framework/tests/acts_base_class_test.py
index ddba989..20f41cf 100755
--- a/acts/framework/tests/acts_base_class_test.py
+++ b/acts/framework/tests/acts_base_class_test.py
@@ -1007,7 +1007,7 @@
registered twice.
"""
mock_test_config = self.test_run_config.copy()
- mock_ctrlr_config_name = mock_controller.ACTS_CONTROLLER_CONFIG_NAME
+ mock_ctrlr_config_name = mock_controller.MOBLY_CONTROLLER_CONFIG_NAME
mock_test_config.controller_configs[mock_ctrlr_config_name] = [
'magic1', 'magic2'
]
@@ -1029,7 +1029,7 @@
is registered twice.
"""
mock_test_config = self.test_run_config.copy()
- mock_ctrlr_config_name = mock_controller.ACTS_CONTROLLER_CONFIG_NAME
+ mock_ctrlr_config_name = mock_controller.MOBLY_CONTROLLER_CONFIG_NAME
mock_test_config.controller_configs[mock_ctrlr_config_name] = [
'magic1', 'magic2'
]
@@ -1044,7 +1044,7 @@
this is for a builtin controller module.
"""
mock_test_config = self.test_run_config.copy()
- mock_ctrlr_config_name = mock_controller.ACTS_CONTROLLER_CONFIG_NAME
+ mock_ctrlr_config_name = mock_controller.MOBLY_CONTROLLER_CONFIG_NAME
mock_ref_name = 'haha'
setattr(mock_controller, 'ACTS_CONTROLLER_REFERENCE_NAME',
mock_ref_name)
@@ -1070,7 +1070,7 @@
def test_register_controller_no_get_info(self):
mock_test_config = self.test_run_config.copy()
- mock_ctrlr_config_name = mock_controller.ACTS_CONTROLLER_CONFIG_NAME
+ mock_ctrlr_config_name = mock_controller.MOBLY_CONTROLLER_CONFIG_NAME
mock_ref_name = 'haha'
get_info = getattr(mock_controller, 'get_info')
delattr(mock_controller, 'get_info')
@@ -1086,7 +1086,7 @@
def test_register_controller_return_value(self):
mock_test_config = self.test_run_config.copy()
- mock_ctrlr_config_name = mock_controller.ACTS_CONTROLLER_CONFIG_NAME
+ mock_ctrlr_config_name = mock_controller.MOBLY_CONTROLLER_CONFIG_NAME
mock_test_config.controller_configs[mock_ctrlr_config_name] = [
'magic1', 'magic2'
]
diff --git a/acts/framework/tests/acts_test_runner_test.py b/acts/framework/tests/acts_test_runner_test.py
index adcfa64..aa19fd4 100755
--- a/acts/framework/tests/acts_test_runner_test.py
+++ b/acts/framework/tests/acts_test_runner_test.py
@@ -59,7 +59,7 @@
"""
mock_test_config = self.base_mock_test_config.copy()
tb_key = keys.Config.key_testbed.value
- mock_ctrlr_config_name = mock_controller.ACTS_CONTROLLER_CONFIG_NAME
+ mock_ctrlr_config_name = mock_controller.MOBLY_CONTROLLER_CONFIG_NAME
my_config = [{
'serial': 'xxxx',
'magic': 'Magic1'
@@ -102,7 +102,7 @@
"""
mock_test_config = self.base_mock_test_config.copy()
tb_key = keys.Config.key_testbed.value
- mock_ctrlr_config_name = mock_controller.ACTS_CONTROLLER_CONFIG_NAME
+ mock_ctrlr_config_name = mock_controller.MOBLY_CONTROLLER_CONFIG_NAME
my_config = [{
'serial': 'xxxx',
'magic': 'Magic1'
diff --git a/acts/framework/tests/mock_controller.py b/acts/framework/tests/mock_controller.py
index 65b2673..2e7456f 100644
--- a/acts/framework/tests/mock_controller.py
+++ b/acts/framework/tests/mock_controller.py
@@ -18,7 +18,7 @@
import logging
-ACTS_CONTROLLER_CONFIG_NAME = "MagicDevice"
+MOBLY_CONTROLLER_CONFIG_NAME = "MagicDevice"
def create(configs):
