Remove site_linux_server
This class doesn't make sense in the new world with only a router
and a DUT. We get most of the utility of what used to be the server
by creating delegate objects which understand how to use commands in
depth. For instance, netperf is run by the NetperfRunner rather than
being split between the client and the server. NetperfRunner now
uses proxy_object.wifi_ip without worrying whether the proxy object
is a DUT or a router. Netperf runner also looks up netperf commands
by itself rather than depending on the proxy object.
BUG=chromium:351555
TEST=All of wifi_matfunc passes with this change.
Change-Id: I093a488b0999cb6c418cab04ff02b3cf0f33136a
Reviewed-on: https://chromium-review.googlesource.com/189625
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/site_linux_router.py b/server/site_linux_router.py
index 3670479..afc93d8 100644
--- a/server/site_linux_router.py
+++ b/server/site_linux_router.py
@@ -68,6 +68,19 @@
return self.host
+ @property
+ def wifi_ip(self):
+ """Simple accessor for the WiFi IP when there is only one AP.
+
+ @return string IP of WiFi interface.
+
+ """
+ if len(self.local_servers) != 1:
+ raise error.TestError('Could not pick a WiFi IP to return.')
+
+ return self.get_wifi_ip(0)
+
+
def __init__(self, host, test_name):
"""Build a LinuxRouter.