Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

client/common_lib/base_barrier.py

 import sys, socket, errno, logging
 from time import time, sleep
 from autotest_lib.client.common_lib import error
 
 # default barrier port
 _DEFAULT_PORT = 11922
 
-def get_host_from_id(hostid):
-    # Remove any trailing local identifier following a #.
-    # This allows multiple members per host which is particularly
-    # helpful in testing.
-    if not hostid.startswith('#'):
-        return hostid.split('#')[0]
-    else:
-        raise error.BarrierError(
-            "Invalid Host id: Host Address should be specified")
-
 
 class BarrierAbortError(error.BarrierError):
     """Special BarrierError raised when an explicit abort is requested."""
 
 
 class listen_server(object):
     """
     Manages a listening socket for barrier.
 
     Can be used to run multiple barrier instances with the same listening
@@ skipping 134 matching lines @@
         logging.info("tag=%s port=%d timeout=%r",
                      self._tag, self._port, self._timeout_secs)
 
         # Number of clients seen (should be the length of self._waiting).
         self._seen = 0
 
         # Clients who have checked in and are waiting (if we are a master).
         self._waiting = {}  # Maps from hostname -> (client, addr) tuples.
 
 
+    def _get_host_from_id(self, hostid):
+        # Remove any trailing local identifier following a #.
+        # This allows multiple members per host which is particularly
+        # helpful in testing.
+        if not hostid.startswith('#'):
+            return hostid.split('#')[0]
+        else:
+            raise error.BarrierError(
+                    "Invalid Host id: Host Address should be specified")
+
+
     def _update_timeout(self, timeout):
         if timeout is not None and self._start_time is not None:
             self._timeout_secs = (time() - self._start_time) + timeout
         else:
             self._timeout_secs = timeout
 
 
     def _remaining(self):
         if self._timeout_secs is not None and self._start_time is not None:
             timeout = self._timeout_secs - (time() - self._start_time)
@@ skipping 207 matching lines @@
 
 
     def _run_client(self, is_master):
         while self._remaining() is None or self._remaining() > 0:
             try:
                 remote = socket.socket(socket.AF_INET,
                         socket.SOCK_STREAM)
                 remote.settimeout(30)
                 if is_master:
                     # Connect to all slaves.
-                    host = get_host_from_id(self._members[self._seen])
+                    host = self._get_host_from_id(self._members[self._seen])
                     logging.info("calling slave: %s", host)
                     connection = (remote, (host, self._port))
                     remote.connect(connection[1])
                     self._master_welcome(connection)
                 else:
                     # Just connect to the master.
-                    host = get_host_from_id(self._masterid)
+                    host = self._get_host_from_id(self._masterid)
                     logging.info("calling master")
                     connection = (remote, (host, self._port))
                     remote.connect(connection[1])
                     self._slave_hello(connection)
             except socket.timeout:
                 logging.warn("timeout calling host, retry")
                 sleep(10)
                 pass
             except socket.error, err:
                 (code, str) = err
@@ skipping 116 matching lines @@
         self._seen = 0
         self._waiting = {}
 
         # Figure out who is the master in this barrier.
         if self._hostid == self._masterid:
             logging.info("selected as master")
             self._run_client(is_master=True)
         else:
             logging.info("selected as slave")
             self._run_server(is_master=False)