Promote 'model' from state to dimension for Macs.

appengine/swarming/swarming_bot/api/os_utilities.py

Index: appengine/swarming/swarming_bot/api/os_utilities.py
diff --git a/appengine/swarming/swarming_bot/api/os_utilities.py b/appengine/swarming/swarming_bot/api/os_utilities.py
index ce8f7b275968a13c74c1c3f8fa15745dbef524dd..60fe6c2c99a0fd58d78892c3d0588b5d25fbea4d 100644
--- a/appengine/swarming/swarming_bot/api/os_utilities.py
+++ b/appengine/swarming/swarming_bot/api/os_utilities.py
@@ -938,6 +938,14 @@ def get_dimensions():
     dimensions[u'zone'] = [platforms.gce.get_zone()]
 
   if sys.platform == 'darwin':
+    model = platforms.osx.get_hardware_model_string()
+    if model:
+      dimensions[u'model'] = [model]

[Ken Russell (switch to Gerrit), 2017/06/09 20:34:00]

Might want to make this a more specific name like machine_model, hardware_model,
etc.

[M-A Ruel, 2017/06/09 20:44:05]

Changed to mac_model. wdyt?

[Ken Russell (switch to Gerrit), 2017/06/09 20:45:33]

SGTM.

+    xcode_versions = platforms.osx.get_xcode_versions()
+    if xcode_versions:
+      dimensions[u'xcode_version'] = xcode_versions
+
+    # iOS devices
     udids = platforms.osx.get_ios_device_ids()
     device_types = set()
     for udid in udids:
@@ -950,7 +958,6 @@ def get_dimensions():
         device_types.add(device_type)
     if device_types:
       dimensions[u'device'] = sorted(device_types)
-    dimensions[u'xcode_version'] = platforms.osx.get_xcode_versions()
 
   return dimensions
 
@@ -997,9 +1004,6 @@ def get_state():
     if integrity is not None:
       state[u'integrity'] = [integrity]
   if sys.platform == 'darwin':
-    model = platforms.osx.get_hardware_model_string()
-    if model:
-      state[u'model'] = model
     state[u'xcode'] = platforms.osx.get_xcode_state()
   if sys.platform == 'linux2':
     temp = platforms.linux.get_temperatures()