From 7437df558f3277e21a4c34a5b517a1cae5dd5a74 Mon Sep 17 00:00:00 2001
From: Michael Gundlach <michael.gundlach@rackspace.com>
Date: Wed, 15 Sep 2010 17:17:20 -0400
Subject: Support querying version list

---
 nova/api/__init__.py       | 13 +++++++++++++
 nova/tests/api/__init__.py |  5 +++--
 run_tests.py               |  4 +++-
 tools/pip-requires         |  4 ++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index b9b9e3988..9f116dada 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -21,6 +21,7 @@ Root WSGI middleware for all API controllers.
 """
 
 import routes
+import webob.dec
 
 from nova import wsgi
 from nova.api import ec2
@@ -32,6 +33,18 @@ class API(wsgi.Router):
 
     def __init__(self):
         mapper = routes.Mapper()
+        mapper.connect("/", controller=self.versions)
         mapper.connect("/v1.0/{path_info:.*}", controller=rackspace.API())
         mapper.connect("/ec2/{path_info:.*}", controller=ec2.API())
         super(API, self).__init__(mapper)
+
+    @webob.dec.wsgify
+    def versions(self, req):
+        """Respond to a request for all OpenStack API versions."""
+        response = {
+                "versions": [
+                    dict(status="CURRENT", id="v1.0")]}
+        metadata = {
+            "application/xml": {
+                "attributes": dict(version=["status", "id"])}}
+        return wsgi.Serializer(req.environ, metadata).to_content_type(response)
diff --git a/nova/tests/api/__init__.py b/nova/tests/api/__init__.py
index 59c4adc3d..4682c094e 100644
--- a/nova/tests/api/__init__.py
+++ b/nova/tests/api/__init__.py
@@ -52,8 +52,9 @@ class Test(unittest.TestCase):
         result = webob.Request.blank('/test/cloud').get_response(api.API())
         self.assertNotEqual(result.body, "/cloud")
 
-    def test_query_api_version(self):
-        pass
+    def test_query_api_versions(self):
+        result = webob.Request.blank('/').get_response(api.API())
+        self.assertTrue('CURRENT' in result.body)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/run_tests.py b/run_tests.py
index 77aa9088a..cf37b820e 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -50,8 +50,10 @@ from nova import flags
 from nova import twistd
 
 from nova.tests.access_unittest import *
-from nova.tests.auth_unittest import *
 from nova.tests.api_unittest import *
+from nova.tests.api import *
+from nova.tests.api.rackspace import *
+from nova.tests.auth_unittest import *
 from nova.tests.cloud_unittest import *
 from nova.tests.compute_unittest import *
 from nova.tests.flags_unittest import *
diff --git a/tools/pip-requires b/tools/pip-requires
index 13e8e5f45..9b8027451 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -6,14 +6,14 @@ amqplib==0.6.1
 anyjson==0.2.4
 boto==2.0b1
 carrot==0.10.5
-eventlet==0.9.10
+eventlet==0.9.12
 lockfile==0.8
 python-daemon==1.5.5
 python-gflags==1.3
 redis==2.0.0
 routes==1.12.3
 tornado==1.0
-webob==0.9.8
+WebOb==0.9.8
 wsgiref==0.1.2
 zope.interface==3.6.1
 mox==0.5.0
-- 
cgit 


From fc93548e99dea561dbf2f198b0fccc84467dbf8b Mon Sep 17 00:00:00 2001
From: Michael Gundlach <michael.gundlach@rackspace.com>
Date: Mon, 20 Sep 2010 17:02:32 -0400
Subject: Undo run_tests.py modification in the hopes of making this merge

---
 run_tests.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index cf37b820e..77aa9088a 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -50,10 +50,8 @@ from nova import flags
 from nova import twistd
 
 from nova.tests.access_unittest import *
-from nova.tests.api_unittest import *
-from nova.tests.api import *
-from nova.tests.api.rackspace import *
 from nova.tests.auth_unittest import *
+from nova.tests.api_unittest import *
 from nova.tests.cloud_unittest import *
 from nova.tests.compute_unittest import *
 from nova.tests.flags_unittest import *
-- 
cgit