autotest: Move hostap_config.py to server/cros/network
TEST=Ran check11b successfully. This indicates that objects were
imported and instantiated correctly.
BUG=chromium:258537
Change-Id: Icfb68a218ca54a019610a342188469c26a706af3
Reviewed-on: https://gerrit.chromium.org/gerrit/61362
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>
diff --git a/server/cros/wlan/hostap_config.py b/server/cros/network/hostap_config.py
similarity index 100%
rename from server/cros/wlan/hostap_config.py
rename to server/cros/network/hostap_config.py
diff --git a/server/site_linux_router.py b/server/site_linux_router.py
index 9bac1a6..1a3c4e1 100644
--- a/server/site_linux_router.py
+++ b/server/site_linux_router.py
@@ -8,7 +8,7 @@
from autotest_lib.client.common_lib import error
from autotest_lib.server import site_linux_system
from autotest_lib.server.cros import wifi_test_utils
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def isLinuxRouter(host):
"""Check if host is a linux router.
diff --git a/server/site_tests/network_WiFi_BeaconInterval/network_WiFi_BeaconInterval.py b/server/site_tests/network_WiFi_BeaconInterval/network_WiFi_BeaconInterval.py
index 41ccf88..22a6f62 100644
--- a/server/site_tests/network_WiFi_BeaconInterval/network_WiFi_BeaconInterval.py
+++ b/server/site_tests/network_WiFi_BeaconInterval/network_WiFi_BeaconInterval.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
from autotest_lib.server.cros.network import wifi_client
diff --git a/server/site_tests/network_WiFi_BgscanBackoff/network_WiFi_BgscanBackoff.py b/server/site_tests/network_WiFi_BgscanBackoff/network_WiFi_BgscanBackoff.py
index 7b87ef7..99dc7c6 100644
--- a/server/site_tests/network_WiFi_BgscanBackoff/network_WiFi_BgscanBackoff.py
+++ b/server/site_tests/network_WiFi_BgscanBackoff/network_WiFi_BgscanBackoff.py
@@ -6,7 +6,7 @@
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
from autotest_lib.server.cros import wifi_test_utils
diff --git a/server/site_tests/network_WiFi_DTIMPeriod/network_WiFi_DTIMPeriod.py b/server/site_tests/network_WiFi_DTIMPeriod/network_WiFi_DTIMPeriod.py
index 6ebc35e..cade8a2 100644
--- a/server/site_tests/network_WiFi_DTIMPeriod/network_WiFi_DTIMPeriod.py
+++ b/server/site_tests/network_WiFi_DTIMPeriod/network_WiFi_DTIMPeriod.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
from autotest_lib.server.cros.network import wifi_client
diff --git a/server/site_tests/network_WiFi_GTK/network_WiFi_GTK.py b/server/site_tests/network_WiFi_GTK/network_WiFi_GTK.py
index 431cebb..2d3040d 100644
--- a/server/site_tests/network_WiFi_GTK/network_WiFi_GTK.py
+++ b/server/site_tests/network_WiFi_GTK/network_WiFi_GTK.py
@@ -8,7 +8,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
from autotest_lib.server.cros.network import arping_runner
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
diff --git a/server/site_tests/network_WiFi_IBSS/network_WiFi_IBSS.py b/server/site_tests/network_WiFi_IBSS/network_WiFi_IBSS.py
index 2a09bbc..f5fe4ee 100644
--- a/server/site_tests/network_WiFi_IBSS/network_WiFi_IBSS.py
+++ b/server/site_tests/network_WiFi_IBSS/network_WiFi_IBSS.py
@@ -4,7 +4,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.server import site_linux_system
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
diff --git a/server/site_tests/network_WiFi_MaskedBSSID/network_WiFi_MaskedBSSID.py b/server/site_tests/network_WiFi_MaskedBSSID/network_WiFi_MaskedBSSID.py
index 71eabeb..3577292 100644
--- a/server/site_tests/network_WiFi_MaskedBSSID/network_WiFi_MaskedBSSID.py
+++ b/server/site_tests/network_WiFi_MaskedBSSID/network_WiFi_MaskedBSSID.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
from autotest_lib.server import site_linux_system
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
diff --git a/server/site_tests/network_WiFi_Netperf/control.wifi_rxampdu b/server/site_tests/network_WiFi_Netperf/control.wifi_rxampdu
index 470204c..7ef84f9 100644
--- a/server/site_tests/network_WiFi_Netperf/control.wifi_rxampdu
+++ b/server/site_tests/network_WiFi_Netperf/control.wifi_rxampdu
@@ -18,7 +18,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import netperf_runner
diff --git a/server/site_tests/network_WiFi_Netperf/control.wifi_txampdu b/server/site_tests/network_WiFi_Netperf/control.wifi_txampdu
index 58241e1..9c0de47 100644
--- a/server/site_tests/network_WiFi_Netperf/control.wifi_txampdu
+++ b/server/site_tests/network_WiFi_Netperf/control.wifi_txampdu
@@ -18,7 +18,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import netperf_runner
diff --git a/server/site_tests/network_WiFi_PTK/network_WiFi_PTK.py b/server/site_tests/network_WiFi_PTK/network_WiFi_PTK.py
index 304e4df..b453622 100644
--- a/server/site_tests/network_WiFi_PTK/network_WiFi_PTK.py
+++ b/server/site_tests/network_WiFi_PTK/network_WiFi_PTK.py
@@ -7,7 +7,7 @@
from autotest_lib.client.common_lib import error
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
diff --git a/server/site_tests/network_WiFi_Powersave/network_WiFi_Powersave.py b/server/site_tests/network_WiFi_Powersave/network_WiFi_Powersave.py
index 8cbc9d1..010edb1 100644
--- a/server/site_tests/network_WiFi_Powersave/network_WiFi_Powersave.py
+++ b/server/site_tests/network_WiFi_Powersave/network_WiFi_Powersave.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
diff --git a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch11_ht40_minus b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch11_ht40_minus
index aa72d21..7d92545 100644
--- a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch11_ht40_minus
+++ b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch11_ht40_minus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch153_ht40_minus b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch153_ht40_minus
index d00891e..4845100 100644
--- a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch153_ht40_minus
+++ b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch153_ht40_minus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch1_ht40_plus b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch1_ht40_plus
index 0f13543..2c9433a 100644
--- a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch1_ht40_plus
+++ b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch1_ht40_plus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch44_ht40_plus b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch44_ht40_plus
index c72486c..447079d 100644
--- a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch44_ht40_plus
+++ b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch44_ht40_plus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch6_ht40_plus b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch6_ht40_plus
index f4874b3..b73a2b0 100644
--- a/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch6_ht40_plus
+++ b/server/site_tests/network_WiFi_RateRange/control.tcp_rx_ch6_ht40_plus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch11_ht40_minus b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch11_ht40_minus
index 49176ec..f248e8f 100644
--- a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch11_ht40_minus
+++ b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch11_ht40_minus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch153_ht40_minus b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch153_ht40_minus
index 4eb112c..ecaebe9 100644
--- a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch153_ht40_minus
+++ b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch153_ht40_minus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch1_ht40_plus b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch1_ht40_plus
index 047674b..a37c76e 100644
--- a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch1_ht40_plus
+++ b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch1_ht40_plus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch44_ht40_plus b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch44_ht40_plus
index c956921..47a6cb4 100644
--- a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch44_ht40_plus
+++ b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch44_ht40_plus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch6_ht40_plus b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch6_ht40_plus
index 788d782..89d4d11 100644
--- a/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch6_ht40_plus
+++ b/server/site_tests/network_WiFi_RateRange/control.udp_rx_ch6_ht40_plus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_RateRange/control.udp_tx_ch44_ht40_plus b/server/site_tests/network_WiFi_RateRange/control.udp_tx_ch44_ht40_plus
index bab05fa..37198b0 100644
--- a/server/site_tests/network_WiFi_RateRange/control.udp_tx_ch44_ht40_plus
+++ b/server/site_tests/network_WiFi_RateRange/control.udp_tx_ch44_ht40_plus
@@ -13,7 +13,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import iperf_config
diff --git a/server/site_tests/network_WiFi_Regulatory/control b/server/site_tests/network_WiFi_Regulatory/control
index 4e4687e..532d1ca 100644
--- a/server/site_tests/network_WiFi_Regulatory/control
+++ b/server/site_tests/network_WiFi_Regulatory/control
@@ -17,7 +17,7 @@
"""
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_RxFrag/network_WiFi_RxFrag.py b/server/site_tests/network_WiFi_RxFrag/network_WiFi_RxFrag.py
index 9f7322a..bea4e72 100644
--- a/server/site_tests/network_WiFi_RxFrag/network_WiFi_RxFrag.py
+++ b/server/site_tests/network_WiFi_RxFrag/network_WiFi_RxFrag.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
diff --git a/server/site_tests/network_WiFi_SecChange/network_WiFi_SecChange.py b/server/site_tests/network_WiFi_SecChange/network_WiFi_SecChange.py
index 0e4738c..6d03a99 100644
--- a/server/site_tests/network_WiFi_SecChange/network_WiFi_SecChange.py
+++ b/server/site_tests/network_WiFi_SecChange/network_WiFi_SecChange.py
@@ -4,7 +4,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
index d10a566..cb018db 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
index 7e01727..b49212f 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
index 452fc68..8cc712c 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
index 7fc8de4..c9573af 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
@@ -18,7 +18,7 @@
from autotest_lib.client.common_lib.cros import site_eap_certs
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
index 49ac943..6cb0e70 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
@@ -18,7 +18,7 @@
from autotest_lib.client.common_lib.cros import site_eap_certs
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def get_configurations():
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
index a197746..60a2a14 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
index 7b8200f..a40e6b4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
@@ -16,11 +16,10 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
- from autotest_lib.server.cros.wlan import hostap_config
caps = [hostap_config.HostapConfig.N_CAPABILITY_GREENFIELD,
hostap_config.HostapConfig.N_CAPABILITY_HT40]
n = hostap_config.HostapConfig.MODE_11N_PURE
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
index 9c0bd9d..669465b 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
index dc30f02..3954129 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
@@ -17,7 +17,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
index 2cdad7f..801ea52 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
@@ -17,7 +17,7 @@
import copy
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
index 20fbcc3..ab5dfcf 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
@@ -17,7 +17,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def get_configurations():
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
index 1d567d6..1850bbd 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
@@ -17,7 +17,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def get_configurations():
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
index ba424c2..4eac4f1 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI
index 4c266d0..f008406 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSGI
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
index 2560f55..1bf630e 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
@@ -17,7 +17,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
index 8a76455..70f55e8 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
@@ -18,7 +18,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
index 7841a55..e057d3d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
index c526d1b..554acf6 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
@@ -17,7 +17,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
index 3743e60..652f2c9 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
index 347ac29..0af2544 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
@@ -18,7 +18,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
index 2c14ae2..b45d495 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
@@ -16,7 +16,7 @@
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
from autotest_lib.client.common_lib.cros.network import xmlrpc_security_types
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
def run(machine):
diff --git a/server/site_tests/network_WiFi_WMM/network_WiFi_WMM.py b/server/site_tests/network_WiFi_WMM/network_WiFi_WMM.py
index 24af6d0..db424e1 100644
--- a/server/site_tests/network_WiFi_WMM/network_WiFi_WMM.py
+++ b/server/site_tests/network_WiFi_WMM/network_WiFi_WMM.py
@@ -3,7 +3,7 @@
# found in the LICENSE file.
from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
-from autotest_lib.server.cros.wlan import hostap_config
+from autotest_lib.server.cros.network import hostap_config
from autotest_lib.server.cros.network import wifi_cell_test_base