Build scripts refactor to support multislave

scripts/master/slaves_list.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import sys
 
 from common import chromium_utils
 
 
 START_WITH_LETTER, NUMBER_ONLY = range(2)
 
 
-def EntryToSlaveName(entry):
-  """Extracts the buildbot slave name from the slaves list entry.
-
-  The slave list entry is a dict."""
-  return entry.get('slavename', None) or entry.get('hostname', None)
-
-
 def EntryToHostName(entry):
   """Extracts the buildbot host name from the slaves list entry.
 
   The slave list entry is a dict."""
   return entry.get('hostname', None)
 
 
 def _obj_as_list(obj):
   """Converts strings as 1 entry list."""
   if not isinstance(obj, (tuple, list)):
@@ skipping 44 matching lines @@
       dupes.add(x)
   if dupes:
     print >> sys.stderr, 'Found slave dupes!\n  %s' % ', '.join(dupes)
     assert False, ', '.join(dupes)
 
 
 class BaseSlavesList(object):
   def __init__(self, slaves, default_master=None):
     self.slaves = slaves
     self.default_master = default_master
-    _CheckDupes([EntryToSlaveName(x).lower() for x in self.slaves])
+    _CheckDupes(
+        [chromium_utils.EntryToSlaveName(x).lower() for x in self.slaves])
 
   def GetSlaves(self, master=None, builder=None, os=None, tester=None,
                 bits=None, version=None):
     """Returns the slaves listed in the private/slaves_list.py file.
 
     Optionally filter with master, builder, os, tester and bitness type.
     """
     slaves = self.slaves
     slaves = _Filter(
         slaves, 'master', master or self.default_master, START_WITH_LETTER)
     slaves = _Filter(slaves, 'os', os, START_WITH_LETTER)
     slaves = _Filter(slaves, 'bits', bits, NUMBER_ONLY)
     slaves = _Filter(slaves, 'version', version, None)
     slaves = _Filter(slaves, 'builder', builder, START_WITH_LETTER)
     slaves = _Filter(slaves, 'tester', tester, START_WITH_LETTER)
     return slaves
 
   def GetSlave(self, master=None, builder=None, os=None, tester=None, bits=None,
                version=None):
     """Returns one slave or none if none or multiple slaves are found."""
     slaves = self.GetSlaves(master, builder, os, tester, bits, version)
     if len(slaves) != 1:
       return None
     return slaves[0]
 
   def GetSlavesName(self, master=None, builder=None, os=None, tester=None,
                     bits=None, version=None):
     """Similar to GetSlaves() except that it only returns the slave names."""
     return [
-        EntryToSlaveName(e)
+        chromium_utils.EntryToSlaveName(e)
         for e in self.GetSlaves(master, builder, os, tester, bits, version)
     ]
 
   def GetSlaveName(self, master=None, builder=None, os=None, tester=None,
                    bits=None, version=None):
     """Similar to GetSlave() except that it only returns the slave name."""
-    return EntryToSlaveName(
+    return chromium_utils.EntryToSlaveName(
         self.GetSlave(master, builder, os, tester, bits, version))
 
   def GetHostName(self, master=None, builder=None, os=None, tester=None,
                    bits=None, version=None):
     """Similar to GetSlave() except that it only returns the host name."""
     return EntryToHostName(
         self.GetSlave(master, builder, os, tester, bits, version))
 
 
 class SlavesList(BaseSlavesList):
@@ skipping 20 matching lines @@
   slaves = SlavesList(options.filename)
   for slave in slaves.GetSlavesName(options.master, options.builder,
                                     options.os, options.tester, options.bits,
                                     options.version):
     print slave
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())