summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-22 21:14:26 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-22 21:14:26 -0700
commit45d28dfb035b4e219845d44e00073d70211e8175 (patch)
treef6f92d85a6a4736f7584d1e350113d9142fbad10 /nova/api
parent5c31b423ba5b5347aac62559c4e5c0a02f264213 (diff)
Fixed up unit tests and direct api that was also calling _serialize (naughty!)
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/direct.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/direct.py b/nova/api/direct.py
index dfca250e0..153871e9f 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -206,7 +206,9 @@ class ServiceWrapper(wsgi.Controller):
params = dict([(str(k), v) for (k, v) in params.iteritems()])
result = method(context, **params)
if type(result) is dict or type(result) is list:
- return self._serialize(result, req.best_match_content_type())
+ content_type = req.best_match_content_type()
+ default_xmlns = self.get_default_xmlns(req)
+ return self._serialize(result, content_type, default_xmlns)
else:
return result