Generalize RAPI request handling flow

All request we goin to hanle have similar prerun steps, lets keep them in the same bucket.

Reviewd-by: iustinp

diff --git a/lib/rapi/RESTHTTPServer.py b/lib/rapi/RESTHTTPServer.py
index b6ea941..a59918d 100644 (file)
--- a/lib/rapi/RESTHTTPServer.py
+++ b/lib/rapi/RESTHTTPServer.py
@@ -93,12 +93,7 @@ class RESTRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
       return
     try:
       rname = self.R_Resource(self.path)
-      mname = 'do_' + self.command
-      if not hasattr(rname, mname):
-        self.send_error(501, "Unsupported method (%r)" % self.command)
-        return
-      method = getattr(rname, mname)
-      method()
+      rname.do_Request(self.command)
     except AttributeError, msg:
       self.send_error(501, "Resource is not available: %s" % msg)
 

diff --git a/lib/rapi/resources.py b/lib/rapi/resources.py
index 1143655..dd3610e 100644 (file)
--- a/lib/rapi/resources.py
+++ b/lib/rapi/resources.py
@@ -119,29 +119,23 @@ class R_Generic(object):
     self.code = 200
     self.result = None
 
-  def do_GET(self):
-    """Default GET flow.
+  def do_Request(self, request):
+    """Default request flow.
 
     """
     try:
-      self._get()
+      disp = getattr(self, '_%s' % request.lower())
+      disp()
       self.send(self.code, self.result)
     except RemoteAPIError, msg:
       self.send_error(self.code, str(msg))
     except ganeti.errors.OpPrereqError, msg:
       self.send_error(404, str(msg))
     except AttributeError, msg:
-      self.send_error(405, 'Method not Implemented: %s' % msg)
+      self.send_error(405, 'Method Not Implemented: %s' % msg)
     except Exception, msg:
       self.send_error(500, 'Internal Server Error: %s' % msg)
 
-  def _get(self):
-    """ GET Stub.
-
-    """
-    raise AttributeError("GET method is not implemented")
-
-
   def send(self, code, data=None):
     """ Printout data.