Always send the device ID when making device management requests.

net/tools/testserver/device_management.py

 #!/usr/bin/python2.5
 # Copyright (c) 2010 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
 from files in a directory. The files should contain policy definitions in JSON
@@ skipping 209 matching lines @@
     Extracts the token from the request and passed to the server in order to
     look up the client. Returns a pair of token and error response. If the token
     is None, the error response is a pair of status code and error message.
 
     Returns:
       A pair of DM token and error response. If the token is None, the message
       will contain the error response to send back.
     """
     error = None
     dmtoken = None
+    request_device_id = self.GetUniqueParam('deviceid')
     match = re.match('GoogleDMToken token=(\\w+)',
                      self._headers.getheader('Authorization', ''))
     if match:
       dmtoken = match.group(1)
     if not dmtoken:
       error = dm.DeviceManagementResponse.DEVICE_MANAGEMENT_TOKEN_INVALID
-    elif not self._server.LookupDevice(dmtoken):
+    elif (not request_device_id or
+          not self._server.LookupDevice(dmtoken) == request_device_id):
       error = dm.DeviceManagementResponse.DEVICE_NOT_FOUND
     else:
       return (dmtoken, None)
 
     response = dm.DeviceManagementResponse()
     response.error = error
 
     self.DumpMessage('Response', response)
 
     return (None, (200, response.SerializeToString()))
@@ skipping 62 matching lines @@
     return self._registered_devices.get(dmtoken, None)
 
   def UnregisterDevice(self, dmtoken):
     """Unregisters a device identified by the given DM token.
 
     Args:
       dmtoken: The device management token provided by the client.
     """
     if dmtoken in self._registered_devices:
       del self._registered_devices[dmtoken]