[autotest]:Removed modem specific autotest control files

Removing all the control files which are part of modem based
autotest suites

BUG=None
TEST=Not Applicable

Change-Id: I084b0d58b74c130b5e2b413343726ba202a87d1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2545109
Commit-Queue: Srikanth Oruganti <srikanthkumar@google.com>
Commit-Queue: Dinesh Kumar Sunkara <dsunkara@google.com>
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Srikanth Oruganti <srikanthkumar@google.com>
Reviewed-by: Dinesh Kumar Sunkara <dsunkara@google.com>
Reviewed-by: Harpreet Grewal <harpreet@chromium.org>
Tested-by: Srikanth Oruganti <srikanthkumar@google.com>
(cherry picked from commit e3662322398bd46ad62906657370e66b33d13712)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2561567
Tested-by: Dinesh Kumar Sunkara <dsunkara@google.com>
Auto-Submit: Dinesh Kumar Sunkara <dsunkara@google.com>
Commit-Queue: Harpreet Grewal <harpreet@chromium.org>
diff --git a/client/site_tests/cellular_DisableWhileConnecting/control.huawei-e303 b/client/site_tests/cellular_DisableWhileConnecting/control.huawei-e303
deleted file mode 100644
index ca042c6..0000000
--- a/client/site_tests/cellular_DisableWhileConnecting/control.huawei-e303
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_DisableWhileConnecting.huawei-e303"
-PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
-CRITERIA = """
-This test will fail if a disconnect request while the modem is
-connecting is not promptly executed.
-"""
-ATTRIBUTES = "suite:cellular_ota"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "carrier:tmobile"
-#The dongle used for this test contains T-Mobile SIM card.
-
-DOC = """
-Check that the 3G modem can handle a disconnect while connecting.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-ITERATIONS_PER_TEST=1
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_DisableWhileConnecting',
-             test_env=test_env,
-             delay_before_disable_ms=0,
-             disable_delay_per_iteration_ms=0,
-             iterations=ITERATIONS_PER_TEST,
-             tag='instant_disable-huawei-e303')
-
-# Since dbus-python emits our calls asynchronously, it is sometimes
-# (often?) the case that the disable arrives before the connect.
-# There's no good way to track what actually gets sent first, so we
-# sleep.
-job.run_test('cellular_DisableWhileConnecting',
-             test_env=test_env,
-             delay_before_disable_ms=0,
-             disable_delay_per_iteration_ms=int(1000.0 / ITERATIONS_PER_TEST),
-             iterations=ITERATIONS_PER_TEST,
-             tag='disable_delay_ramp-huawei-e303')
diff --git a/client/site_tests/cellular_DisableWhileConnecting/control.huawei-me936 b/client/site_tests/cellular_DisableWhileConnecting/control.huawei-me936
deleted file mode 100644
index 64d21dc..0000000
--- a/client/site_tests/cellular_DisableWhileConnecting/control.huawei-me936
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_DisableWhileConnecting.huawei-me936"
-PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
-CRITERIA = """
-This test will fail if a disconnect request while the modem is
-connecting is not promptly executed.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-me936"
-
-DOC = """
-Check that the 3G modem can handle a disconnect while connecting.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-ITERATIONS_PER_TEST=1
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_DisableWhileConnecting',
-             test_env=test_env,
-             delay_before_disable_ms=0,
-             disable_delay_per_iteration_ms=0,
-             iterations=ITERATIONS_PER_TEST,
-             tag='instant_disable-huawei-me936')
-
-# Since dbus-python emits our calls asynchronously, it is sometimes
-# (often?) the case that the disable arrives before the connect.
-# There's no good way to track what actually gets sent first, so we
-# sleep.
-job.run_test('cellular_DisableWhileConnecting',
-             test_env=test_env,
-             delay_before_disable_ms=0,
-             disable_delay_per_iteration_ms=int(1000.0 / ITERATIONS_PER_TEST),
-             iterations=ITERATIONS_PER_TEST,
-             tag='disable_delay_ramp-huawei-me936')
diff --git a/client/site_tests/cellular_DisableWhileConnecting/control.zte-mf190 b/client/site_tests/cellular_DisableWhileConnecting/control.zte-mf190
deleted file mode 100644
index 6549c80..0000000
--- a/client/site_tests/cellular_DisableWhileConnecting/control.zte-mf190
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_DisableWhileConnecting.zte-mf190"
-PURPOSE = "Check that the 3G modem can handle a disconnect while connecting."
-CRITERIA = """
-This test will fail if a disconnect request while the modem is
-connecting is not promptly executed.
-"""
-ATTRIBUTES = "suite:cellular_ota"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:zte-mf190"
-
-DOC = """
-Check that the 3G modem can handle a disconnect while connecting.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-ITERATIONS_PER_TEST=1
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_DisableWhileConnecting',
-             test_env=test_env,
-             delay_before_disable_ms=0,
-             disable_delay_per_iteration_ms=0,
-             iterations=ITERATIONS_PER_TEST,
-             tag='instant_disable-zte-mf190')
-
-# Since dbus-python emits our calls asynchronously, it is sometimes
-# (often?) the case that the disable arrives before the connect.
-# There's no good way to track what actually gets sent first, so we
-# sleep.
-job.run_test('cellular_DisableWhileConnecting',
-             test_env=test_env,
-             delay_before_disable_ms=0,
-             disable_delay_per_iteration_ms=int(1000.0 / ITERATIONS_PER_TEST),
-             iterations=ITERATIONS_PER_TEST,
-             tag='disable_delay_ramp-zte-mf190')
diff --git a/client/site_tests/cellular_Identifiers/control.fibocom-l850gl b/client/site_tests/cellular_Identifiers/control.fibocom-l850gl
deleted file mode 100644
index ced57ba..0000000
--- a/client/site_tests/cellular_Identifiers/control.fibocom-l850gl
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Identifiers.fibocom-l850gl"
-PURPOSE = "Verify cellular modem provides correct identification information."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - Cellular modem does not provide an identifier
-"""
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_sprint, suite:cellular_ota_verizon"
-DEPENDENCIES = "modem:fibocom-l850gl"
-DOC = """
-  Tests that a cellular modem provides correct identification information
-
-  The test queries the modem for the following identifiers:
-    - MEID
-    - IMEI
-    - IMSI
-    - ICCID
-    - SIM operator ID
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Identifiers', tag='fibocom-l850gl', test_env=test_env)
diff --git a/client/site_tests/cellular_Identifiers/control.huawei-e303 b/client/site_tests/cellular_Identifiers/control.huawei-e303
deleted file mode 100644
index 29fef01..0000000
--- a/client/site_tests/cellular_Identifiers/control.huawei-e303
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Identifiers.huawei-e303"
-PURPOSE = "Verify cellular modem provides correct identification information."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - Cellular modem does not provide an identifier
-"""
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-ATTRIBUTES = "suite:cellular_ota"
-DEPENDENCIES = "carrier:tmobile"
-#The dongle used for this test contains T-Mobile SIM card.
-
-DOC = """
-  Tests that a cellular modem provides correct identification information
-
-  The test queries the modem for the following identifiers:
-    - MEID
-    - IMEI
-    - IMSI
-    - ICCID
-    - SIM operator ID
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Identifiers', tag='huawei-e303', test_env=test_env)
diff --git a/client/site_tests/cellular_Identifiers/control.huawei-me936 b/client/site_tests/cellular_Identifiers/control.huawei-me936
deleted file mode 100644
index af7b6a3..0000000
--- a/client/site_tests/cellular_Identifiers/control.huawei-me936
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Identifiers.huawei-me936"
-PURPOSE = "Verify cellular modem provides correct identification information."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - Cellular modem does not provide an identifier
-"""
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-DEPENDENCIES = "modem:huawei-me936"
-DOC = """
-  Tests that a cellular modem provides correct identification information
-
-  The test queries the modem for the following identifiers:
-    - MEID
-    - IMEI
-    - IMSI
-    - ICCID
-    - SIM operator ID
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Identifiers', tag='huawei-me936', test_env=test_env)
diff --git a/client/site_tests/cellular_Identifiers/control.zte-mf190 b/client/site_tests/cellular_Identifiers/control.zte-mf190
deleted file mode 100644
index 02e6050..0000000
--- a/client/site_tests/cellular_Identifiers/control.zte-mf190
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Identifiers.zte-mf190"
-PURPOSE = "Verify cellular modem provides correct identification information."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - Cellular modem does not provide an identifier
-"""
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-ATTRIBUTES = "suite:cellular_ota"
-DEPENDENCIES = "modem:zte-mf190"
-DOC = """
-  Tests that a cellular modem provides correct identification information
-
-  The test queries the modem for the following identifiers:
-    - MEID
-    - IMEI
-    - IMSI
-    - ICCID
-    - SIM operator ID
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Identifiers', tag='zte-mf190', test_env=test_env)
diff --git a/client/site_tests/cellular_ModemControl/control.fibocom-l850gl b/client/site_tests/cellular_ModemControl/control.fibocom-l850gl
deleted file mode 100644
index da8d366..0000000
--- a/client/site_tests/cellular_ModemControl/control.fibocom-l850gl
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_ModemControl.fibocom-l850gl"
-PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
-CRITERIA = """
-This test will fail if modem manager state differs from flimflam state.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_sprint, suite:cellular_ota_verizon"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:fibocom-l850gl"
-
-DOC = """
-  Tests that commands sent to ModemManager are reflected in flimflam.
-
-  Issues many connect, disconnect, enable, and disable commands to ensure
-  that the modem state is always properly reflected in flimflam -- even
-  if the commands are sent to the modem manager instead of flimflam.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=False,
-             tag='no-autoconnect-fibocom-l850gl')
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=True,
-             tag='autoconnect-fibocom-l850gl')
diff --git a/client/site_tests/cellular_ModemControl/control.huawei-e303 b/client/site_tests/cellular_ModemControl/control.huawei-e303
deleted file mode 100644
index 3bcd40f..0000000
--- a/client/site_tests/cellular_ModemControl/control.huawei-e303
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_ModemControl.huawei-e303"
-PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
-CRITERIA = """
-This test will fail if modem manager state differs from flimflam state.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-e303"
-
-DOC = """
-  Tests that commands sent to ModemManager are reflected in flimflam.
-
-  Issues many connect, disconnect, enable, and disable commands to ensure
-  that the modem state is always properly reflected in flimflam -- even
-  if the commands are sent to the modem manager instead of flimflam.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=False,
-             tag='no-autoconnect-huawei-e303')
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=True,
-             tag='autoconnect-huawei-e303')
diff --git a/client/site_tests/cellular_ModemControl/control.huawei-me936 b/client/site_tests/cellular_ModemControl/control.huawei-me936
deleted file mode 100644
index dfdb0e9..0000000
--- a/client/site_tests/cellular_ModemControl/control.huawei-me936
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_ModemControl.huawei-me936"
-PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
-CRITERIA = """
-This test will fail if modem manager state differs from flimflam state.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-me936"
-
-DOC = """
-  Tests that commands sent to ModemManager are reflected in flimflam.
-
-  Issues many connect, disconnect, enable, and disable commands to ensure
-  that the modem state is always properly reflected in flimflam -- even
-  if the commands are sent to the modem manager instead of flimflam.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=False,
-             tag='no-autoconnect-huawei-me936')
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=True,
-             tag='autoconnect-huawei-me936')
diff --git a/client/site_tests/cellular_ModemControl/control.zte-mf190 b/client/site_tests/cellular_ModemControl/control.zte-mf190
deleted file mode 100644
index 9ab41b4..0000000
--- a/client/site_tests/cellular_ModemControl/control.zte-mf190
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_ModemControl.zte-mf190"
-PURPOSE = "Verify commands sent to a modem manager are reflected in flimflam."
-CRITERIA = """
-This test will fail if modem manager state differs from flimflam state.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:zte-mf190"
-
-DOC = """
-  Tests that commands sent to ModemManager are reflected in flimflam.
-
-  Issues many connect, disconnect, enable, and disable commands to ensure
-  that the modem state is always properly reflected in flimflam -- even
-  if the commands are sent to the modem manager instead of flimflam.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=False,
-             tag='no-autoconnect-zte-mf190')
-job.run_test('cellular_ModemControl', test_env=test_env, autoconnect=True,
-             tag='autoconnect-zte-mf190')
diff --git a/client/site_tests/cellular_SafetyDance/control.fibocom-l850gl b/client/site_tests/cellular_SafetyDance/control.fibocom-l850gl
deleted file mode 100644
index bd9c3e8..0000000
--- a/client/site_tests/cellular_SafetyDance/control.fibocom-l850gl
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SafetyDance.fibocom-l850gl"
-PURPOSE = "Stress-test all connman 3G operations."
-CRITERIA = """
-This test will fail if any DBus call times out or flimflam crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_sprint, suite:cellular_ota_verizon"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:fibocom-l850gl"
-
-DOC = """
-  Stress-tests all connman 3G operations.
-
-  This test runs a long series of 3G operations in pseudorandom order. All of
-  these 3G operations must return a convincing result (EINPROGRESS or no error).
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_SafetyDance', test_env=test_env, tag='fibocom-l850gl')
diff --git a/client/site_tests/cellular_SafetyDance/control.huawei-e303 b/client/site_tests/cellular_SafetyDance/control.huawei-e303
deleted file mode 100644
index de50ef6..0000000
--- a/client/site_tests/cellular_SafetyDance/control.huawei-e303
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SafetyDance.huawei-e303"
-PURPOSE = "Stress-test all connman 3G operations."
-CRITERIA = """
-This test will fail if any DBus call times out or flimflam crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "carrier:tmobile"
-#The dongle used for this test contains T-Mobile SIM card.
-
-DOC = """
-  Stress-tests all connman 3G operations.
-
-  This test runs a long series of 3G operations in pseudorandom order. All of
-  these 3G operations must return a convincing result (EINPROGRESS or no error).
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_SafetyDance', test_env=test_env, tag='huawei-e303')
diff --git a/client/site_tests/cellular_SafetyDance/control.huawei-me936 b/client/site_tests/cellular_SafetyDance/control.huawei-me936
deleted file mode 100644
index 255ef52..0000000
--- a/client/site_tests/cellular_SafetyDance/control.huawei-me936
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SafetyDance.huawei-me936"
-PURPOSE = "Stress-test all connman 3G operations."
-CRITERIA = """
-This test will fail if any DBus call times out or flimflam crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-me936"
-
-DOC = """
-  Stress-tests all connman 3G operations.
-
-  This test runs a long series of 3G operations in pseudorandom order. All of
-  these 3G operations must return a convincing result (EINPROGRESS or no error).
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_SafetyDance', test_env=test_env, tag='huawei-me936')
diff --git a/client/site_tests/cellular_SafetyDance/control.zte-mf190 b/client/site_tests/cellular_SafetyDance/control.zte-mf190
deleted file mode 100644
index 1b19749..0000000
--- a/client/site_tests/cellular_SafetyDance/control.zte-mf190
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SafetyDance.zte-mf190"
-PURPOSE = "Stress-test all connman 3G operations."
-CRITERIA = """
-This test will fail if any DBus call times out or flimflam crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:zte-mf190"
-
-DOC = """
-  Stress-tests all connman 3G operations.
-
-  This test runs a long series of 3G operations in pseudorandom order. All of
-  these 3G operations must return a convincing result (EINPROGRESS or no error).
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_SafetyDance', test_env=test_env, tag='zte-mf190')
diff --git a/client/site_tests/cellular_Smoke/control.fibocom-l850gl b/client/site_tests/cellular_Smoke/control.fibocom-l850gl
deleted file mode 100644
index 83a8591..0000000
--- a/client/site_tests/cellular_Smoke/control.fibocom-l850gl
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Smoke.fibocom-l850gl"
-PURPOSE = "Verify 3G modem can connect to the network."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - 3G modem fails to connect to network
-  - the modem is not left in a working state
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_sprint, suite:cellular_ota_verizon"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:fibocom-l850gl"
-
-# TODO(crbug.com/932661) Fix the root cause of the flakiness and
-# remove this hack.
-JOB_RETRIES=3
-
-DOC = """
-  Tests that 3G modem can connect to the network
-
-  The test attempts to connect using the 3G network.  It assumes that
-  a 3G modem is plugged in and has a signal.  The test then
-  disconnects from the network, and verifies that the modem still
-  responds to modem manager DBUS API calls.  It repeats the
-  connect/disconnect sequence several times.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Smoke', tag='fibocom-l850gl', test_env=test_env)
diff --git a/client/site_tests/cellular_Smoke/control.huawei-e303 b/client/site_tests/cellular_Smoke/control.huawei-e303
deleted file mode 100644
index 9c30889..0000000
--- a/client/site_tests/cellular_Smoke/control.huawei-e303
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Smoke.huawei-e303"
-PURPOSE = "Verify 3G modem can connect to the network."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - 3G modem fails to connect to network
-  - the modem is not left in a working state
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-e303"
-DOC = """
-  Tests that 3G modem can connect to the network
-
-  The test attempts to connect using the 3G network.  It assumes that
-  a 3G modem is plugged in and has a signal.  The test then
-  disconnects from the network, and verifies that the modem still
-  responds to modem manager DBUS API calls.  It repeats the
-  connect/disconnect sequence several times.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Smoke', tag='huawei-e303', test_env=test_env)
diff --git a/client/site_tests/cellular_Smoke/control.huawei-me936 b/client/site_tests/cellular_Smoke/control.huawei-me936
deleted file mode 100644
index 725496e..0000000
--- a/client/site_tests/cellular_Smoke/control.huawei-me936
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Smoke.huawei-me936"
-PURPOSE = "Verify 3G modem can connect to the network."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - 3G modem fails to connect to network
-  - the modem is not left in a working state
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-me936"
-DOC = """
-  Tests that 3G modem can connect to the network
-
-  The test attempts to connect using the 3G network.  It assumes that
-  a 3G modem is plugged in and has a signal.  The test then
-  disconnects from the network, and verifies that the modem still
-  responds to modem manager DBUS API calls.  It repeats the
-  connect/disconnect sequence several times.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Smoke', tag='huawei-me936', test_env=test_env)
diff --git a/client/site_tests/cellular_Smoke/control.zte-mf190 b/client/site_tests/cellular_Smoke/control.zte-mf190
deleted file mode 100644
index 06c78f4..0000000
--- a/client/site_tests/cellular_Smoke/control.zte-mf190
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_Smoke.zte-mf190"
-PURPOSE = "Verify 3G modem can connect to the network."
-CRITERIA = """
-This test will fail if one of the following conditions occur:
-  - 3G modem fails to connect to network
-  - the modem is not left in a working state
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:zte-mf190"
-DOC = """
-  Tests that 3G modem can connect to the network
-
-  The test attempts to connect using the 3G network.  It assumes that
-  a 3G modem is plugged in and has a signal.  The test then
-  disconnects from the network, and verifies that the modem still
-  responds to modem manager DBUS API calls.  It repeats the
-  connect/disconnect sequence several times.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_Smoke', tag='zte-mf190', test_env=test_env)
diff --git a/client/site_tests/cellular_StressEnable/control.fibocom-l850gl b/client/site_tests/cellular_StressEnable/control.fibocom-l850gl
deleted file mode 100644
index 2d0f3f0..0000000
--- a/client/site_tests/cellular_StressEnable/control.fibocom-l850gl
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_StressEnable.fibocom-l850gl"
-PURPOSE = "Stress-test Connman enable/disable"
-CRITERIA = """
-This test fails if flimflam ever fails to respond to a DBus message or crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_sprint, suite:cellular_ota_verizon"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:fibocom-l850gl"
-
-DOC = """
-  Stress-tests enabling and disabling a technology at short intervals.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_StressEnable', tag='fibocom-l850gl', test_env=test_env)
diff --git a/client/site_tests/cellular_StressEnable/control.huawei-e303 b/client/site_tests/cellular_StressEnable/control.huawei-e303
deleted file mode 100644
index 138b2af..0000000
--- a/client/site_tests/cellular_StressEnable/control.huawei-e303
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_StressEnable.huawei-e303"
-PURPOSE = "Stress-test Connman enable/disable"
-CRITERIA = """
-This test fails if flimflam ever fails to respond to a DBus message or crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "carrier:tmobile"
-#The dongle used for this test contains T-Mobile SIM card.
-
-DOC = """
-  Stress-tests enabling and disabling a technology at short intervals.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_StressEnable', tag='huawei-e303', test_env=test_env)
diff --git a/client/site_tests/cellular_StressEnable/control.huawei-me936 b/client/site_tests/cellular_StressEnable/control.huawei-me936
deleted file mode 100644
index 6022911..0000000
--- a/client/site_tests/cellular_StressEnable/control.huawei-me936
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_StressEnable.huawei-me936"
-PURPOSE = "Stress-test Connman enable/disable"
-CRITERIA = """
-This test fails if flimflam ever fails to respond to a DBus message or crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-me936"
-
-DOC = """
-  Stress-tests enabling and disabling a technology at short intervals.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_StressEnable', tag='huawei-me936', test_env=test_env)
diff --git a/client/site_tests/cellular_StressEnable/control.zte-mf190 b/client/site_tests/cellular_StressEnable/control.zte-mf190
deleted file mode 100644
index 80044cb..0000000
--- a/client/site_tests/cellular_StressEnable/control.zte-mf190
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (c) 2015 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_StressEnable.zte-mf190"
-PURPOSE = "Stress-test Connman enable/disable"
-CRITERIA = """
-This test fails if flimflam ever fails to respond to a DBus message or crashes.
-"""
-ATTRIBUTES = "suite:cellular_ota"
-TIME = "SHORT"
-TEST_CATEGORY = "Stress"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:zte-mf190"
-
-DOC = """
-  Stress-tests enabling and disabling a technology at short intervals.
-"""
-
-from autotest_lib.client.cros.cellular import test_environment
-
-test_env = test_environment.CellularOTATestEnvironment()
-job.run_test('cellular_StressEnable', tag='zte-mf190', test_env=test_env)
diff --git a/client/site_tests/cellular_SuspendResume/control.fibocom-l850gl b/client/site_tests/cellular_SuspendResume/control.fibocom-l850gl
deleted file mode 100644
index 0300587..0000000
--- a/client/site_tests/cellular_SuspendResume/control.fibocom-l850gl
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SuspendResume.fibocom-l850gl"
-PURPOSE = "Test 3g modem state after suspend/resume"
-CRITERIA = """
-    Check the 3g state of the device after suspend and resume.  Verify
-    that 3g can be enabled under all situations after resuming of device.
-    Verify that if autoconnect is turned on that the modem autoconnects
-    after resuming.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_sprint, suite:cellular_ota_verizon"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:fibocom-l850gl"
-
-DOC = """
-    Verify that 3g can be enabled under all suspend/resume situations.
-"""
-
-# Run all scenarios twice, first with autoconnect off, then with it on
-job.run_test('cellular_SuspendResume',
-             autoconnect=False, tag='autoconnect_off-fibocom-l850gl')
-job.run_test('cellular_SuspendResume',
-             autoconnect=True, tag='autoconnect_on-fibocom-l850gl')
diff --git a/client/site_tests/cellular_SuspendResume/control.huawei-e303 b/client/site_tests/cellular_SuspendResume/control.huawei-e303
deleted file mode 100644
index e827a98..0000000
--- a/client/site_tests/cellular_SuspendResume/control.huawei-e303
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SuspendResume.huawei-e303"
-PURPOSE = "Test 3g modem state after suspend/resume"
-CRITERIA = """
-    Check the 3g state of the device after suspend and resume.  Verify
-    that 3g can be enabled under all situations after resuming of device.
-    Verify that if autoconnect is turned on that the modem autoconnects
-    after resuming.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-e303"
-
-DOC = """
-    Verify that 3g can be enabled under all suspend/resume situations.
-"""
-
-# Run all scenarios twice, first with autoconnect off, then with it on
-job.run_test('cellular_SuspendResume',
-             autoconnect=False, tag='autoconnect_off-huawei-e303')
-job.run_test('cellular_SuspendResume',
-             autoconnect=True, tag='autoconnect_on-huawei-e303')
diff --git a/client/site_tests/cellular_SuspendResume/control.huawei-me936 b/client/site_tests/cellular_SuspendResume/control.huawei-me936
deleted file mode 100644
index 2f98afc..0000000
--- a/client/site_tests/cellular_SuspendResume/control.huawei-me936
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SuspendResume.huawei-me936"
-PURPOSE = "Test 3g modem state after suspend/resume"
-CRITERIA = """
-    Check the 3g state of the device after suspend and resume.  Verify
-    that 3g can be enabled under all situations after resuming of device.
-    Verify that if autoconnect is turned on that the modem autoconnects
-    after resuming.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:huawei-me936"
-
-DOC = """
-    Verify that 3g can be enabled under all suspend/resume situations.
-"""
-
-# Run all scenarios twice, first with autoconnect off, then with it on
-job.run_test('cellular_SuspendResume',
-             autoconnect=False, tag='autoconnect_off-huawei-me936')
-job.run_test('cellular_SuspendResume',
-             autoconnect=True, tag='autoconnect_on-huawei-me936')
diff --git a/client/site_tests/cellular_SuspendResume/control.zte-mf190 b/client/site_tests/cellular_SuspendResume/control.zte-mf190
deleted file mode 100644
index c2cf9bb..0000000
--- a/client/site_tests/cellular_SuspendResume/control.zte-mf190
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2017 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-AUTHOR = "ChromeOS Team"
-NAME = "cellular_SuspendResume.zte-mf190"
-PURPOSE = "Test 3g modem state after suspend/resume"
-CRITERIA = """
-    Check the 3g state of the device after suspend and resume.  Verify
-    that 3g can be enabled under all situations after resuming of device.
-    Verify that if autoconnect is turned on that the modem autoconnects
-    after resuming.
-"""
-ATTRIBUTES = "suite:cellular_ota_att, suite:cellular_ota_tmobile"
-TIME = "SHORT"
-TEST_CATEGORY = "Functional"
-TEST_CLASS = "network"
-TEST_TYPE = "client"
-DEPENDENCIES = "modem:zte-mf190"
-
-DOC = """
-    Verify that 3g can be enabled under all suspend/resume situations.
-"""
-
-# Run all scenarios twice, first with autoconnect off, then with it on
-job.run_test('cellular_SuspendResume',
-             autoconnect=False, tag='autoconnect_off-zte-mf190')
-job.run_test('cellular_SuspendResume',
-             autoconnect=True, tag='autoconnect_on-zte-mf190')