commit 6b1d9e7eb7cc38012597d1ce4dcae2a6f39175a3
author Christopher Wiley <wiley@chromium.org> Sat Dec 13 18:07:41 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Dec 20 01:28:45 2014 +0000
tree 812f8aca66b182ee1e1d40caa74339f8cfb077e7
parent 433a302b2d3d4cd0a34cdbbb5c737c804949f86e

autotest: Consolidate WiFi/Bluetooth DNS name mangling

Adopt Bluetooth's style of rejecting IP addresses rather than
checking anything that doesn't look like the lab domain names.
Always prefer commandline specified hostnames to inferred hostnames.
While here, remove some WiFi test methods without callsites.

BUG=None
TEST=All of the following pass:
network_WiFi_SimpleConnect.wifi_checkWPA_TKIP (w/wo router_addr)
network_WiFi_AttenuatedPerf.ht40_c001
bluetooth_Sanity_Discovery

Change-Id: Ia76b0e159daeb6fe694dabd56a73fe544371de26
Reviewed-on: https://chromium-review.googlesource.com/236657
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>
Tested-by: Christopher Wiley <wiley@chromium.org>

server/cros/bluetooth/bluetooth_tester.py

diff --git a/server/cros/bluetooth/bluetooth_tester.py b/server/cros/bluetooth/bluetooth_tester.py
index c2e3178..6ac0552 100644
--- a/server/cros/bluetooth/bluetooth_tester.py
+++ b/server/cros/bluetooth/bluetooth_tester.py
@@ -4,11 +4,11 @@
 
 import base64
 import json
-import socket
 
-from autotest_lib.client.common_lib import error
 from autotest_lib.client.cros import constants
-from autotest_lib.server import autotest, hosts
+from autotest_lib.server import autotest
+from autotest_lib.server import hosts
+from autotest_lib.server.cros import dnsname_mangler
 
 
 class BluetoothTester(object):
@@ -226,24 +226,8 @@
     @return Autotest host object for the Tester.
 
     """
-
-    def is_ip_address(hostname):
-        try:
-            socket.inet_aton(hostname)
-            return True
-        except socket.error:
-            return False
-
-    try:
-        tester_hostname = args['tester']
-    except KeyError:
-        device_hostname = device_host.hostname
-        if is_ip_address(device_hostname):
-            raise error.TestError("Remote host cannot be an IP address unless "
-                                  "tester specified with --args tester=IP")
-
-        parts = device_hostname.split('.')
-        parts[0] = parts[0] + '-router'
-        tester_hostname = '.'.join(parts)
-
-    return hosts.create_host(tester_hostname)
+    cmdline_override = args.get('tester', None)
+    hostname = dnsname_mangler.get_tester_addr(
+            device_host.hostname,
+            cmdline_override=cmdline_override)
+    return hosts.create_host(hostname)