Move master_port_alts from 40000 to 25000 so they don't overlap with ephemeral ports

scripts/tools/mastermap.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 r"""Tool for viewing masters, their hosts and their ports.
 
 Has three modes:
   a) In normal mode, simply prints the list of all known masters, sorted by
      hostname, along with their associated ports, for the perusal of the user.
@@ skipping 51 matching lines @@
     41795,  # Crestron Control Port
     45824,  # Server for the DAI family of client-server products
     47001,  # WinRM
     47808,  # BACnet Building Automation and Control Networks
     48653,  # Robot Raconteur transport
     49151,  # Reserved
     # There are no reserved ports in the 50000-65535 range.
 ])
 
 
-PORT_TYPE_MAP = {
-  'port': Master.Base.MASTER_PORT,
-  'slave_port': Master.Base.SLAVE_PORT,
-  'alt_port': Master.Base.MASTER_PORT_ALT,
+PORT_RANGE_MAP = {
+  'port': Master.Base.MASTER_PORT_RANGE,
+  'slave_port': Master.Base.SLAVE_PORT_RANGE,
+  'alt_port': Master.Base.MASTER_PORT_ALT_RANGE,
 }
 
 
 # A map of (full) master host to master class used in 'get_master_class'
 # lookup.
 MASTER_HOST_MAP = dict((m.master_host, m)
                        for m in Master.get_base_masters())
 
 
 def get_args():
@@ skipping 153 matching lines @@
   Outputs lists of masters whose ports conflict and who have misconfigured
   ports. If any misconfigurations are found, returns a non-zero error code.
   """
 
   # Return value. Will be set to 1 the first time we see an error.
   ret = 0
 
   # Look for masters using the wrong ports for their port types.
   bad_port_masters = []
   for master in masters:
-    for port_type, port_digit in PORT_TYPE_MAP.iteritems():
-      if not str(master[port_type]).startswith(str(port_digit)):
+    for port_type, port_range in PORT_RANGE_MAP.iteritems():
+      if not port_range.contains(master[port_type]):
         ret = 1
         bad_port_masters.append(master)
         break
   output([ ('Masters with misconfigured ports based on port type',
             field('name')) ],
          bad_port_masters)
 
   # Look for masters using the wrong ports for their hostname.
   bad_host_masters = []
   for master in masters:
     digits = get_master_port(master)
     if digits:
-      for port in PORT_TYPE_MAP.iterkeys():
-        if str(master[port])[1:3] != digits:
+      for port_type, port_range in PORT_RANGE_MAP.iteritems():
+        if ('%04d' % port_range.offset_of(master[port_type]))[0:2] != digits:
           ret = 1
           bad_host_masters.append(master)
           break
   output([ ('Masters with misconfigured ports based on hostname',
             field('name')) ],
          bad_host_masters)
 
   # Look for masters configured to use the same ports.
   web_ports = {}
   slave_ports = {}
@@ skipping 52 matching lines @@
     if len(lst) > 1:
       ret = 1
       for m in lst:
         conflicting_alt_ports.append(
             { 'alt_port': port, 'name': m['name'], 'host': m['host'] })
   output([ ('Alt port', field('alt_port')),
            ('Master', field('name')),
            ('Host', field('host')) ],
          conflicting_alt_ports)
 
-  # Look for masters whose port, slave_port, alt_port aren't separated by 10000.
+  # Look for masters whose port, slave_port, alt_port aren't separated by 5000.
   bad_sep_masters = []
   for master in masters:
-    if (getint(master['slave_port']) - getint(master['port']) != 10000 or
-        getint(master['alt_port']) - getint(master['slave_port']) != 10000):
+    if (getint(master['slave_port']) - getint(master['alt_port']) != 5000 or
+        getint(master['alt_port']) - getint(master['port']) != 5000):
       ret = 1
       bad_sep_masters.append(master)
   output([ ('Master', field('name')),
            ('Host', field('host')),
            ('Web port', field('port')),
            ('Slave port', field('slave_port')),
            ('Alt port', field('alt_port')) ],
          bad_sep_masters)
 
   return ret
 
 
 def build_port_str(master_class, port_type, digits):
-  port_base = PORT_TYPE_MAP[port_type]
-  port = '%d%02d%02d' % (port_base, master_class.master_port_base, digits)
+  port_range = PORT_RANGE_MAP[port_type]
+  port = str(port_range.compose_port(
+      master_class.master_port_base * 100 + digits))
   assert len(port) == 5, "Invalid port generated (%s)" % (port,)
   return port
 
 
 def find_port(master_class_name, masters, output, opts):
   """Finds a triplet of free ports appropriate for the given master."""
   try:
     master_class = getattr(Master, master_class_name)
   except AttributeError:
     raise ValueError('Master class %s does not exist' % master_class_name)
@@ skipping 110 matching lines @@
 
   return ret
 
 
 def main():
   return real_main(include_internal=False)
 
 
 if __name__ == '__main__':
   sys.exit(main())