summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-10-19 01:02:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-19 01:02:11 +0000
commitd046cb3f512aa8fa9d396edab8145f3fe8bc7b24 (patch)
treecb66e22452a11cb986a4f4cec340e7c2e2a08c07
parent44a313bc9c00021f694299f97dc0dbe4b457f5c4 (diff)
parented89832f6008bcb49a4bb0f91cf93246e0bf53e6 (diff)
downloadplatform_tools_test_connectivity-d046cb3f512aa8fa9d396edab8145f3fe8bc7b24.tar.gz
platform_tools_test_connectivity-d046cb3f512aa8fa9d396edab8145f3fe8bc7b24.tar.bz2
platform_tools_test_connectivity-d046cb3f512aa8fa9d396edab8145f3fe8bc7b24.zip
Merge "[AP_LIB]Correcting variable names"
-rw-r--r--acts/framework/acts/controllers/ap_lib/hostapd_ap_preset.py4
-rwxr-xr-xacts/framework/acts/controllers/ap_lib/hostapd_constants.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/acts/framework/acts/controllers/ap_lib/hostapd_ap_preset.py b/acts/framework/acts/controllers/ap_lib/hostapd_ap_preset.py
index e57f333ced..60889034af 100644
--- a/acts/framework/acts/controllers/ap_lib/hostapd_ap_preset.py
+++ b/acts/framework/acts/controllers/ap_lib/hostapd_ap_preset.py
@@ -54,8 +54,8 @@ def create_ap_preset(profile_name='whirlwind',
# The Onhub uses wlan0, wlan1 as the WAN interfaces, while the Gale uses
# wlan-2400mhz, wlan-5000mhz.
- if iface_wlan_2g not in hotapd_constants.2G_INTERFACE_LIST or \
- iface_wlan_5g not in hotapd_constants.5G_INTERFACE_LIST:
+ if iface_wlan_2g not in hotapd_constants.INTERFACE_2G_LIST or \
+ iface_wlan_5g not in hotapd_constants.INTERFACE_5G_LIST:
raise ValueError('Incorrect interface name was passed.')
force_wmm = None
diff --git a/acts/framework/acts/controllers/ap_lib/hostapd_constants.py b/acts/framework/acts/controllers/ap_lib/hostapd_constants.py
index af4a4620de..3d3f23327f 100755
--- a/acts/framework/acts/controllers/ap_lib/hostapd_constants.py
+++ b/acts/framework/acts/controllers/ap_lib/hostapd_constants.py
@@ -49,8 +49,8 @@ AP_SSID_LENGTH_2G = 8
AP_PASSPHRASE_LENGTH_2G = 10
AP_SSID_LENGTH_5G = 8
AP_PASSPHRASE_LENGTH_5G = 10
-2G_INTERFACE_LIST = [WLAN0_STRING, WLAN0_GALE]
-5G_INTERFACE_LIST = [WLAN1_STRING, WLAN1_GALE]
+INTERFACE_2G_LIST = [WLAN0_STRING, WLAN0_GALE]
+INTERFACE_5G_LIST = [WLAN1_STRING, WLAN1_GALE]
# A mapping of frequency to channel number. This includes some
# frequencies used outside the US.