[Kimchi-devel] [PATCH V3 2/5] Enhance generate_action_handler to redirect a new resource

[shaohef at linux.vnet.ibm.com]

From: ShaoHe Feng <shaohef at linux.vnet.ibm.com>

POST method may create a new resource. It is better to raise a new
HTTPRedirect to let the client know it.

However there's already a HTTPRedirect for PUT method.

Make use of these codes of PUT method, and make a new method for
HTTPRedirect.

Signed-off-by: ShaoHe Feng <shaohef at linux.vnet.ibm.com>
---
 src/kimchi/control/base.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py
index 1e233ea..e8f03ae 100644
--- a/src/kimchi/control/base.py
+++ b/src/kimchi/control/base.py
@@ -58,6 +58,12 @@ class Resource(object):
         self.model_args = (ident,)
         self.update_params = []
 
+    def _redirect(self, ident, code=303):
+        if ident is not None and ident != self.ident:
+            uri_params = list(self.model_args[:-1])
+            uri_params += [urllib2.quote(ident.encode('utf-8'))]
+            raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code)
+
     def generate_action_handler(self, action_name, action_args=None):
         def wrapper(*args, **kwargs):
             validate_method(('POST'))
@@ -67,7 +73,8 @@ class Resource(object):
                     model_args.extend(parse_request()[key]
                                       for key in action_args)
                 fn = getattr(self.model, model_fn(self, action_name))
-                fn(*model_args)
+                ident = fn(*model_args)
+                self._redirect(ident)
                 uri_params = tuple(self.model_args)
                 raise internal_redirect(self.uri_fmt % uri_params)
             except MissingParameter, e:
@@ -155,10 +162,7 @@ class Resource(object):
 
         args = list(self.model_args) + [params]
         ident = update(*args)
-        if ident != self.ident:
-            uri_params = list(self.model_args[:-1])
-            uri_params += [urllib2.quote(ident.encode('utf-8'))]
-            raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), 303)
+        self._redirect(ident)
 
         return self.get()
 
-- 
1.8.4.2