wsgi can now handle dispatching action None more elegantly

2 files changed, 19 insertions, 7 deletions

diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index e71b80e2c..385ae4625 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -60,8 +60,9 @@ class TextDeserializer(object):
 
     def deserialize(self, datastring, action='default'):
         """Find local deserialization method and parse request body."""
-        action_method = getattr(self, action, self.default)
-        return action_method(datastring)
+        action_method = getattr(self, str(action), self.default)
+        output = action_method(datastring)
+        return output
 
     def default(self, datastring):
         """Default deserialization code should live here"""
@@ -189,11 +190,9 @@ class DictSerializer(object):
 
     def serialize(self, data, action='default'):
         """Find local serialization method and encode response body."""
-        if action is None:
-            action_method = self.default
-        else:
-            action_method = getattr(self, action, self.default)
-        return action_method(data)
+        action_method = getattr(self, str(action), self.default)
+        output = action_method(data)
+        return output
 
     def default(self, data):
         """Default serialization code should live here"""
diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py
index 0329ab218..5ec7712dd 100644
--- a/nova/tests/api/openstack/test_wsgi.py
+++ b/nova/tests/api/openstack/test_wsgi.py
@@ -89,6 +89,13 @@ class DictSerializerTest(test.TestCase):
         serializer.default = lambda x: 'trousers'
         self.assertEqual(serializer.serialize({}, 'update'), 'trousers')
 
+    def test_dispatch_action_None(self):
+        serializer = wsgi.DictSerializer()
+        serializer.create = lambda x: 'pants'
+        serializer.default = lambda x: 'trousers'
+        self.assertEqual(serializer.serialize({}, None), 'trousers')
+
+
 
 class XMLDictSerializerTest(test.TestCase):
     def test_xml(self):
@@ -123,6 +130,12 @@ class TextDeserializerTest(test.TestCase):
         deserializer.default = lambda x: 'trousers'
         self.assertEqual(deserializer.deserialize({}, 'update'), 'trousers')
 
+    def test_dispatch_action_None(self):
+        deserializer = wsgi.TextDeserializer()
+        deserializer.create = lambda x: 'pants'
+        deserializer.default = lambda x: 'trousers'
+        self.assertEqual(deserializer.deserialize({}, None), 'trousers')
+
 
 class JSONDeserializerTest(test.TestCase):
     def test_json(self):