Refactored device status uploading out of policy fetch infrastructure.

chrome/browser/policy/test/policy_testserver.py

 # 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.
 
 """A bare-bones test server for testing cloud policy support.
 
 This implements a simple cloud policy test server that can be used to test
 chrome's device management service client. The policy information is read from
 the file named device_management in the server's data directory. It contains
 enforced and recommended policies for the device and user scope, and a list
@@ skipping 293 matching lines @@
       response = self.ProcessApiAuthorization(rmsg.service_api_access_request)
     elif request_type == 'unregister':
       response = self.ProcessUnregister(rmsg.unregister_request)
     elif request_type == 'policy':
       response = self.ProcessPolicy(rmsg, request_type)
     elif request_type == 'enterprise_check':
       response = self.ProcessAutoEnrollment(rmsg.auto_enrollment_request)
     elif request_type == 'device_state_retrieval':
       response = self.ProcessDeviceStateRetrievalRequest(
           rmsg.device_state_retrieval_request)
+    elif request_type == 'status_upload':
+      response = self.ProcessStatusUploadRequest(
+          rmsg.device_status_report_request, rmsg.session_status_report_request)
     else:
       return (400, 'Invalid request parameter')
 
-    self.DumpMessage('Response', response[1])
-    return (response[0], response[1].SerializeToString())
+    if isinstance(response[1], basestring):
+      body = response[1]
+    elif isinstance(response[1], google.protobuf.message.Message):
+      self.DumpMessage('Response', response[1])
+      body = response[1].SerializeToString()
+    else:
+      body = ''
+    return (response[0], body)

[Mattias Nissler (ping if slow), 2015/01/23 13:46:35]

Thanks for rescuing this snippet.

[Andrew T Wilson (Slow), 2015/01/23 19:16:19]

Yep :)

 
   def CreatePolicyForExternalPolicyData(self, policy_key):
     """Returns an ExternalPolicyData protobuf for policy_key.
 
     If there is policy data for policy_key then the download url will be
     set so that it points to that data, and the appropriate hash is also set.
     Otherwise, the protobuf will be empty.
 
     Args:
       policy_key: The policy type and settings entity id, joined by '/'.
@@ skipping 220 matching lines @@
       ]
       for field in FIELDS:
         if field in state:
           setattr(device_state_retrieval_response, field, state[field])
 
     response = dm.DeviceManagementResponse()
     response.device_state_retrieval_response.CopyFrom(
         device_state_retrieval_response)
     return (200, response)
 
+  def ProcessStatusUploadRequest(self, device_status, session_status):
+    """Handles a device/session status upload request.
+
+    Returns:
+      A tuple of HTTP status code and response data to send to the client.
+    """
+    # Empty responses indicate a successful upload.
+    device_status_report_response = dm.DeviceStatusReportResponse()
+    session_status_report_response = dm.SessionStatusReportResponse()
+
+    response = dm.DeviceManagementResponse()
+    response.device_status_report_response.CopyFrom(
+        device_status_report_response)
+    response.session_status_report_response.CopyFrom(
+        session_status_report_response)
+
+    return (200, response)
+
   def SetProtobufMessageField(self, group_message, field, field_value):
     """Sets a field in a protobuf message.
 
     Args:
       group_message: The protobuf message.
       field: The field of the message to set, it should be a member of
           group_message.DESCRIPTOR.fields.
       field_value: The value to set.
     """
     if field.label == field.LABEL_REPEATED:
@@ skipping 688 matching lines @@
     if (self.options.log_to_console):
       logger.addHandler(logging.StreamHandler())
     if (self.options.log_file):
       logger.addHandler(logging.FileHandler(self.options.log_file))
 
     testserver_base.TestServerRunner.run_server(self)
 
 
 if __name__ == '__main__':
   sys.exit(PolicyServerRunner().main())