Avoid key error for custom machine types

appengine/swarming/swarming_bot/api/os_utilities.py

 # Copyright 2014 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """OS specific utility functions.
 
 Includes code:
 - to declare the current system this code is running under.
 - to run a command on user login.
 - to reboot the host.
@@ skipping 394 matching lines @@
   return None
 
 
 @tools.cached
 def get_cost_hour():
   """Returns the cost in $USD/h as a floating point value if applicable."""
   # Machine.
   machine_type = get_machine_type()
   if platforms.is_gce():
     if platforms.gce.get_zone().startswith('us-'):
-      machine_cost = GCE_MACHINE_COST_HOUR_US[machine_type]
+      machine_cost = GCE_MACHINE_COST_HOUR_US.get(machine_type, 0.)

[borenet, 2017/04/07 12:19:25]

I suspect we'll want a default, eg. GCE_MACHINE_COST_HOUR_US['n1-standard-8']

[M-A Ruel, 2017/04/07 12:20:16]

Bah, I prefer 0 than something really wrong. I don't mind much.

     else:
-      machine_cost = GCE_MACHINE_COST_HOUR_EUROPE_ASIA[machine_type]
+      machine_cost = GCE_MACHINE_COST_HOUR_EUROPE_ASIA.get(machine_type, 0.)
   else:
     # Guess an equivalent machine_type.
     machine_cost = GCE_MACHINE_COST_HOUR_US.get(machine_type, 0.)
 
   # OS.
   os_cost = 0.
   if sys.platform == 'darwin':
     # Apple tax. It's 50% better, right?
     os_cost = GCE_WINDOWS_COST_CORE_HOUR * 1.5 * get_num_processors()
   elif sys.platform == 'win32':
@@ skipping 776 matching lines @@
 
 
 def trim_rolled_log(name):
   try:
     for item in glob.iglob('%s.??' % name):
       os.remove(item)
     for item in glob.iglob('%s.???' % name):
       os.remove(item)
   except Exception as e:
     logging.exception('trim_rolled_log(%s) failed: %s', name, e)