Change reference to 'shopfloor' by 'server_proxy'.
For programs calling 'shopfloor.get_instance' without using the helper
functions (hwid, auxlog) in shopfloor module, we can easily change them
to new server_proxy.GetServerProxy.
BUG=chromium:760017
TEST=make test
Change-Id: Ied56fde78fc73cafc22f66f07c36795a5cf68523
Reviewed-on: https://chromium-review.googlesource.com/642628
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/py/tools/ghost.py b/py/tools/ghost.py
index f41ae25..da58ead 100755
--- a/py/tools/ghost.py
+++ b/py/tools/ghost.py
@@ -421,12 +421,12 @@
logging.warning('GetGateWayIP: unsupported platform')
return []
- def GetShopfloorIP(self):
+ def GetFactoryServerIP(self):
try:
import factory_common # pylint: disable=unused-variable
- from cros.factory.test import shopfloor
+ from cros.factory.test import server_proxy
- url = shopfloor.get_server_url()
+ url = server_proxy.GetServerURL()
match = re.match(r'^https?://(.*):.*$', url)
if match:
return [match.group(1)]
@@ -1162,7 +1162,7 @@
t.start()
def ScanServer(self):
- for meth in [self.GetGateWayIP, self.GetShopfloorIP]:
+ for meth in [self.GetGateWayIP, self.GetFactoryServerIP]:
for addr in [(x, _OVERLORD_PORT) for x in meth()]:
if addr not in self._overlord_addrs:
self._overlord_addrs.append(addr)