commit f46ad4c84892c3a88d61f76f4f07888be6798a61
author showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Wed Feb 03 20:28:59 2010 +0000
committer showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Wed Feb 03 20:28:59 2010 +0000
tree b4bc6a9a61e6502e78bea4b5ccf001440ae352d1
parent ed62e48ffbf9f4959c5352efa5d518c58b7accc5

* make RESTful interface use absolute URIs throughout.  there's little price to this and it makes the system more consistent, makes responses valid standalone data, simplifies the job of the clients, and could be useful in building services that operate across multiple autotest servers in the future.
* since generating abolute URIs requires the request object (we need to examine headers), there were some substantial refactorings to pass around the request object more widely.
* also fixing a little bug where the django exceptions module was being hidden.
* finally, refactored request code in rest_client a bit to improve testability

Signed-off-by: Steve Howard <showard@google.com>


git-svn-id: http://test.kernel.org/svn/autotest/trunk@4195 592f7852-d20e-0410-864c-8624ca9c26a4

frontend/shared/rest_client.py

diff --git a/frontend/shared/rest_client.py b/frontend/shared/rest_client.py
index d6aca5d..8525e8d 100644
--- a/frontend/shared/rest_client.py
+++ b/frontend/shared/rest_client.py
@@ -3,9 +3,6 @@
 from django.utils import simplejson
 
 
-_RESOURCE_DIRECTORY_PATH = '/afe/server/resources/'
-
-
 _http = httplib2.Http()
 
 
@@ -37,9 +34,7 @@
 
 
 class Resource(object):
-    def __init__(self, base_uri, representation_dict):
-        self._base_uri = base_uri
-
+    def __init__(self, representation_dict):
         assert 'href' in representation_dict
         for key, value in representation_dict.iteritems():
             setattr(self, str(key), value)
@@ -55,8 +50,8 @@
 
 
     @classmethod
-    def directory(cls, base_uri):
-        directory = cls(base_uri, {'href': _RESOURCE_DIRECTORY_PATH})
+    def load(cls, uri):
+        directory = cls({'href': uri})
         return directory.get()
 
 
@@ -68,7 +63,7 @@
             converted_dict = dict((key, self._read_representation(sub_value))
                                   for key, sub_value in value.iteritems())
             if 'href' in converted_dict:
-                return type(self)(self._base_uri, converted_dict)
+                return type(self)(converted_dict)
             return converted_dict
         return value
 
@@ -92,30 +87,37 @@
                     and not callable(value))
 
 
-    def _request(self, method, query_parameters=None, encoded_body=None):
-        uri_parts = []
-        if not re.match(r'^https?://', self.href):
-            uri_parts.append(self._base_uri)
-        uri_parts.append(self.href)
+    @classmethod
+    def _do_request(self, method, uri, query_parameters, encoded_body):
         if query_parameters:
-            query_string = urllib.urlencode(query_parameters)
-            uri_parts.extend(['?', query_string])
+            query_string = '?' + urllib.urlencode(query_parameters)
+        else:
+            query_string = ''
+        full_uri = uri + query_string
 
         if encoded_body:
             entity_body = simplejson.dumps(encoded_body)
         else:
             entity_body = None
 
-        full_uri = ''.join(uri_parts)
         logging.debug('%s %s', method, full_uri)
         if entity_body:
             logging.debug(entity_body)
         headers, response_body = _http.request(
-                ''.join(uri_parts), method, body=entity_body,
+                full_uri, method, body=entity_body,
                 headers={'Content-Type': 'application/json'})
         logging.debug('Response: %s', headers['status'])
 
-        response = Response(headers, response_body)
+        return Response(headers, response_body)
+
+
+    def _request(self, method, query_parameters=None, encoded_body=None):
+        if query_parameters is None:
+            query_parameters = {}
+
+        response = self._do_request(method, self.href, query_parameters,
+                                    encoded_body)
+
         if 300 <= response.status < 400: # redirection
             raise NotImplementedError(str(response)) # TODO
         if 400 <= response.status < 500: