From aa29a67d5cecfa320f98fa9989bf0b9179240016 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 23 Mar 2012 20:27:34 +0000
Subject: makes volume versions display properly

 * The compute versions controller changed during a refactor and broke
   the volume versions controller (since we are using it as a base class)
 * Added naive test
 * fixes bug 963357

Change-Id: Ica9c65952b800d316d264db11f89e369e56bcade
---
 nova/api/openstack/volume/versions.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/volume/versions.py b/nova/api/openstack/volume/versions.py
index f1c39a59c..68d34b1f9 100644
--- a/nova/api/openstack/volume/versions.py
+++ b/nova/api/openstack/volume/versions.py
@@ -56,15 +56,19 @@ VERSIONS = {
 
 
 class Versions(versions.Versions):
-    def dispatch(self, request, *args):
-        """Respond to a request for all OpenStack API versions."""
-        builder = views_versions.get_view_builder(request)
-        if request.path == '/':
-            # List Versions
-            return builder.build_versions(VERSIONS)
-        else:
-            # Versions Multiple Choice
-            return builder.build_choices(VERSIONS, request)
+    @wsgi.serializers(xml=versions.VersionsTemplate,
+                      atom=versions.VersionsAtomSerializer)
+    def index(self, req):
+        """Return all versions."""
+        builder = views_versions.get_view_builder(req)
+        return builder.build_versions(VERSIONS)
+
+    @wsgi.serializers(xml=versions.ChoicesTemplate)
+    @wsgi.response(300)
+    def multi(self, req):
+        """Return multiple choices."""
+        builder = views_versions.get_view_builder(req)
+        return builder.build_choices(VERSIONS, req)
 
 
 class VolumeVersionV1(object):
-- 
cgit