Creating new v2 namespace in nova.api.openstack

Related to blueprint separate-nova-adminapi

Change-Id: Ida35372b7263c4a4efdafd35faa1325c4436459b

42 files changed, 189 insertions, 177 deletions

diff --git a/nova/tests/api/openstack/__init__.py b/nova/tests/api/openstack/__init__.py
index 00fcfbb00..e69de29bb 100644
--- a/nova/tests/api/openstack/__init__.py
+++ b/nova/tests/api/openstack/__init__.py
@@ -1,16 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 OpenStack LLC.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 0f58cf55b..c12ae5eab 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -23,25 +23,25 @@ import webob.request
 
 from glance import client as glance_client
 
-from nova import context
-from nova import exception as exc
-from nova import utils
-from nova import wsgi
-import nova.api.openstack.auth
-from nova.api import openstack
+import nova.api.openstack.v2.auth
 from nova.api import auth as api_auth
-from nova.api.openstack import auth
-from nova.api.openstack import extensions
-from nova.api.openstack import limits
-from nova.api.openstack import urlmap
-from nova.api.openstack import versions
+from nova.api.openstack import v2
+from nova.api.openstack.v2 import auth
+from nova.api.openstack.v2 import extensions
+from nova.api.openstack.v2 import limits
+from nova.api.openstack.v2 import urlmap
+from nova.api.openstack.v2 import versions
 from nova.api.openstack import wsgi as os_wsgi
 from nova.auth.manager import User, Project
 from nova.compute import instance_types
 from nova.compute import vm_states
+from nova import context
 from nova.db.sqlalchemy import models
+from nova import exception as exc
 import nova.image.fake
 from nova.tests.glance import stubs as glance_stubs
+from nova import utils
+from nova import wsgi
 
 
 class Context(object):
@@ -72,35 +72,36 @@ def fake_wsgi(self, req):
     return self.application
 
 
-def wsgi_app(inner_app11=None, fake_auth=True, fake_auth_context=None,
+def wsgi_app(inner_app_v2=None, fake_auth=True, fake_auth_context=None,
         serialization=os_wsgi.LazySerializationMiddleware,
         use_no_auth=False):
-    if not inner_app11:
-        inner_app11 = openstack.APIRouter()
+    if not inner_app_v2:
+        inner_app_v2 = v2.APIRouter()
 
     if fake_auth:
         if fake_auth_context is not None:
             ctxt = fake_auth_context
         else:
             ctxt = context.RequestContext('fake', 'fake', auth_token=True)
-        api11 = openstack.FaultWrapper(api_auth.InjectContext(ctxt,
+        api_v2 = v2.FaultWrapper(api_auth.InjectContext(ctxt,
               limits.RateLimitingMiddleware(
                   serialization(
-                      extensions.ExtensionMiddleware(inner_app11)))))
+                      extensions.ExtensionMiddleware(inner_app_v2)))))
     elif use_no_auth:
-        api11 = openstack.FaultWrapper(auth.NoAuthMiddleware(
+        api_v2 = v2.FaultWrapper(auth.NoAuthMiddleware(
               limits.RateLimitingMiddleware(
                   serialization(
-                      extensions.ExtensionMiddleware(inner_app11)))))
+                      extensions.ExtensionMiddleware(inner_app_v2)))))
     else:
-        api11 = openstack.FaultWrapper(auth.AuthMiddleware(
+        api_v2 = v2.FaultWrapper(auth.AuthMiddleware(
               limits.RateLimitingMiddleware(
                   serialization(
-                      extensions.ExtensionMiddleware(inner_app11)))))
+                      extensions.ExtensionMiddleware(inner_app_v2)))))
         Auth = auth
     mapper = urlmap.URLMap()
-    mapper['/v1.1'] = api11
-    mapper['/'] = openstack.FaultWrapper(versions.Versions())
+    mapper['/v2'] = api_v2
+    mapper['/v1.1'] = api_v2
+    mapper['/'] = v2.FaultWrapper(versions.Versions())
     return mapper
 
 
@@ -136,9 +137,9 @@ def stub_out_auth(stubs):
     def fake_auth_init(self, app):
         self.application = app
 
-    stubs.Set(nova.api.openstack.auth.AuthMiddleware,
+    stubs.Set(nova.api.openstack.v2.auth.AuthMiddleware,
         '__init__', fake_auth_init)
-    stubs.Set(nova.api.openstack.auth.AuthMiddleware,
+    stubs.Set(nova.api.openstack.v2.auth.AuthMiddleware,
         '__call__', fake_wsgi)
 
 
@@ -147,10 +148,10 @@ def stub_out_rate_limiting(stubs):
         super(limits.RateLimitingMiddleware, self).__init__(app)
         self.application = app
 
-    stubs.Set(nova.api.openstack.limits.RateLimitingMiddleware,
+    stubs.Set(nova.api.openstack.v2.limits.RateLimitingMiddleware,
         '__init__', fake_rate_init)
 
-    stubs.Set(nova.api.openstack.limits.RateLimitingMiddleware,
+    stubs.Set(nova.api.openstack.v2.limits.RateLimitingMiddleware,
         '__call__', fake_wsgi)
 
 
diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py
index 18bd136df..87cb2d3fe 100644
--- a/nova/tests/api/openstack/test_faults.py
+++ b/nova/tests/api/openstack/test_faults.py
@@ -24,7 +24,6 @@ import webob.exc
 
 from nova import test
 from nova.api.openstack import common
-from nova.api.openstack import faults
 from nova.api.openstack import wsgi
 
 
@@ -46,7 +45,7 @@ class TestFaults(test.TestCase):
         ]
 
         for request in requests:
-            fault = faults.Fault(webob.exc.HTTPBadRequest(explanation='scram'))
+            fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='scram'))
             response = request.get_response(fault)
 
             expected = {
@@ -69,7 +68,7 @@ class TestFaults(test.TestCase):
 
         for request in requests:
             exc = webob.exc.HTTPRequestEntityTooLarge
-            fault = faults.Fault(exc(explanation='sorry',
+            fault = wsgi.Fault(exc(explanation='sorry',
                         headers={'Retry-After': 4}))
             response = request.get_response(fault)
 
@@ -89,7 +88,7 @@ class TestFaults(test.TestCase):
         """Ensure the ability to raise `Fault`s in WSGI-ified methods."""
         @webob.dec.wsgify
         def raiser(req):
-            raise faults.Fault(webob.exc.HTTPNotFound(explanation='whut?'))
+            raise wsgi.Fault(webob.exc.HTTPNotFound(explanation='whut?'))
 
         req = webob.Request.blank('/.xml')
         resp = req.get_response(raiser)
@@ -99,7 +98,7 @@ class TestFaults(test.TestCase):
 
     def test_fault_has_status_int(self):
         """Ensure the status_int is set correctly on faults"""
-        fault = faults.Fault(webob.exc.HTTPBadRequest(explanation='what?'))
+        fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='what?'))
         self.assertEqual(fault.status_int, 400)
 
     def test_xml_serializer(self):
@@ -107,7 +106,7 @@ class TestFaults(test.TestCase):
         request = webob.Request.blank('/v1.1',
                                       headers={"Accept": "application/xml"})
 
-        fault = faults.Fault(webob.exc.HTTPBadRequest(explanation='scram'))
+        fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='scram'))
         response = request.get_response(fault)
 
         self.assertTrue(common.XML_NS_V11 in response.body)
diff --git a/nova/tests/api/openstack/v2/__init__.py b/nova/tests/api/openstack/v2/__init__.py
new file mode 100644
index 000000000..00fcfbb00
--- /dev/null
+++ b/nova/tests/api/openstack/v2/__init__.py
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
diff --git a/nova/tests/api/openstack/contrib/__init__.py b/nova/tests/api/openstack/v2/contrib/__init__.py
index 848908a95..848908a95 100644
--- a/nova/tests/api/openstack/contrib/__init__.py
+++ b/nova/tests/api/openstack/v2/contrib/__init__.py
diff --git a/nova/tests/api/openstack/contrib/test_admin_actions.py b/nova/tests/api/openstack/v2/contrib/test_admin_actions.py
index 4b62c0ba7..4b62c0ba7 100644
--- a/nova/tests/api/openstack/contrib/test_admin_actions.py
+++ b/nova/tests/api/openstack/v2/contrib/test_admin_actions.py
diff --git a/nova/tests/api/openstack/contrib/test_createserverext.py b/nova/tests/api/openstack/v2/contrib/test_createserverext.py
index f7ee96917..5c9e0499a 100644
--- a/nova/tests/api/openstack/contrib/test_createserverext.py
+++ b/nova/tests/api/openstack/v2/contrib/test_createserverext.py
@@ -22,12 +22,12 @@ from xml.dom import minidom
 
 import webob
 
+import nova
 from nova import db
 from nova import exception
 from nova import flags
 from nova import rpc
 from nova import test
-import nova.api.openstack
 from nova.tests.api.openstack import fakes
 
 
diff --git a/nova/tests/api/openstack/contrib/test_disk_config.py b/nova/tests/api/openstack/v2/contrib/test_disk_config.py
index 40875cb84..ac2391a04 100644
--- a/nova/tests/api/openstack/contrib/test_disk_config.py
+++ b/nova/tests/api/openstack/v2/contrib/test_disk_config.py
@@ -14,19 +14,19 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 import datetime
 
+from nova.api.openstack import v2
+from nova.api.openstack.v2 import extensions
+from nova.api.openstack import wsgi
 import nova.db.api
-import nova.rpc
-
 from nova import flags
+import nova.rpc
 from nova import test
-from nova import utils
-from nova.api import openstack
-from nova.api.openstack import extensions
-from nova.api.openstack import servers
-from nova.api.openstack import wsgi
 from nova.tests.api.openstack import fakes
+from nova import utils
+
 
 MANUAL_INSTANCE_UUID = fakes.FAKE_UUID
 AUTO_INSTANCE_UUID = fakes.FAKE_UUID.replace('a', 'b')
@@ -113,7 +113,7 @@ class DiskConfigTestCase(test.TestCase):
 
         self.stubs.Set(nova.db, 'instance_create', fake_instance_create)
 
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         app = extensions.ExtensionMiddleware(app)
         app = wsgi.LazySerializationMiddleware(app)
         self.app = app
diff --git a/nova/tests/api/openstack/contrib/test_extendedstatus.py b/nova/tests/api/openstack/v2/contrib/test_extendedstatus.py
index 0065f6fde..54246727c 100644
--- a/nova/tests/api/openstack/contrib/test_extendedstatus.py
+++ b/nova/tests/api/openstack/v2/contrib/test_extendedstatus.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import json
+
 import webob
 
 from nova import compute
diff --git a/nova/tests/api/openstack/contrib/test_flavors_extra_specs.py b/nova/tests/api/openstack/v2/contrib/test_flavors_extra_specs.py
index 5784743ee..5f9be886f 100644
--- a/nova/tests/api/openstack/contrib/test_flavors_extra_specs.py
+++ b/nova/tests/api/openstack/v2/contrib/test_flavors_extra_specs.py
@@ -16,15 +16,14 @@
 #    under the License.
 
 import json
-import stubout
-import webob
 import os.path
 
+import stubout
+import webob
 
+from nova.api.openstack.v2 import extensions
+from nova.api.openstack.v2.contrib import flavorextraspecs
 from nova import test
-from nova.api import openstack
-from nova.api.openstack import extensions
-from nova.api.openstack.contrib import flavorextraspecs
 from nova.tests.api.openstack import fakes
 import nova.wsgi
 
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/v2/contrib/test_floating_ips.py
index 63831f31f..ded363406 100644
--- a/nova/tests/api/openstack/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/v2/contrib/test_floating_ips.py
@@ -15,8 +15,11 @@
 
 import json
 import stubout
+
 import webob
 
+from nova.api.openstack.v2.contrib import floating_ips
+from nova.api.openstack.v2.contrib import floating_ips
 from nova import compute
 from nova import context
 from nova import db
@@ -24,11 +27,7 @@ from nova import network
 from nova import rpc
 from nova import test
 from nova.tests.api.openstack import fakes
-from nova.tests.api.openstack import test_servers
-
-
-from nova.api.openstack.contrib import floating_ips
-from nova.api.openstack.contrib.floating_ips import _translate_floating_ip_view
+from nova.tests.api.openstack.v2 import test_servers
 
 
 def network_api_get_floating_ip(self, context, id):
@@ -143,7 +142,7 @@ class FloatingIpTest(test.TestCase):
         floating_ip_address = self._create_floating_ip()
         floating_ip = db.floating_ip_get_by_address(self.context,
                                                     floating_ip_address)
-        view = _translate_floating_ip_view(floating_ip)
+        view = floating_ips._translate_floating_ip_view(floating_ip)
         self.assertTrue('floating_ip' in view)
         self.assertTrue(view['floating_ip']['id'])
         self.assertEqual(view['floating_ip']['ip'], self.address)
@@ -152,7 +151,7 @@ class FloatingIpTest(test.TestCase):
 
     def test_translate_floating_ip_view_dict(self):
         floating_ip = {'id': 0, 'address': '10.0.0.10', 'fixed_ip': None}
-        view = _translate_floating_ip_view(floating_ip)
+        view = floating_ips._translate_floating_ip_view(floating_ip)
         self.assertTrue('floating_ip' in view)
 
     def test_floating_ips_list(self):
diff --git a/nova/tests/api/openstack/contrib/test_keypairs.py b/nova/tests/api/openstack/v2/contrib/test_keypairs.py
index 92e401aac..b2f595e5e 100644
--- a/nova/tests/api/openstack/contrib/test_keypairs.py
+++ b/nova/tests/api/openstack/v2/contrib/test_keypairs.py
@@ -14,12 +14,13 @@
 #    under the License.
 
 import json
+
 import webob
 
+from nova.api.openstack.v2.contrib.keypairs import KeypairController
 from nova import context
 from nova import db
 from nova import test
-from nova.api.openstack.contrib.keypairs import KeypairController
 from nova.tests.api.openstack import fakes
 
 
diff --git a/nova/tests/api/openstack/contrib/test_multinic_xs.py b/nova/tests/api/openstack/v2/contrib/test_multinic_xs.py
index 90999a384..68f99d363 100644
--- a/nova/tests/api/openstack/contrib/test_multinic_xs.py
+++ b/nova/tests/api/openstack/v2/contrib/test_multinic_xs.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import json
+
 import stubout
 import webob
 
diff --git a/nova/tests/api/openstack/contrib/test_quotas.py b/nova/tests/api/openstack/v2/contrib/test_quotas.py
index 6374dfd93..15fb20f94 100644
--- a/nova/tests/api/openstack/contrib/test_quotas.py
+++ b/nova/tests/api/openstack/v2/contrib/test_quotas.py
@@ -18,12 +18,11 @@
 import json
 import webob
 
+from nova.api.openstack.v2.contrib.quotas import QuotaSetsController
 from nova import context
 from nova import test
 from nova.tests.api.openstack import fakes
 
-from nova.api.openstack.contrib.quotas import QuotaSetsController
-
 
 def quota_set(id):
     return {'quota_set': {'id': id, 'metadata_items': 128, 'volumes': 10,
diff --git a/nova/tests/api/openstack/contrib/test_rescue.py b/nova/tests/api/openstack/v2/contrib/test_rescue.py
index f5b69865c..9058d101e 100644
--- a/nova/tests/api/openstack/contrib/test_rescue.py
+++ b/nova/tests/api/openstack/v2/contrib/test_rescue.py
@@ -13,6 +13,7 @@
 #   under the License.
 
 import json
+
 import webob
 
 from nova import compute
diff --git a/nova/tests/api/openstack/contrib/test_security_groups.py b/nova/tests/api/openstack/v2/contrib/test_security_groups.py
index 1e7a439b0..fd4e0841d 100644
--- a/nova/tests/api/openstack/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/v2/contrib/test_security_groups.py
@@ -15,15 +15,16 @@
 #    under the License.
 
 import json
-import mox
-import nova
 import unittest
-import webob
 from xml.dom import minidom
 
+import mox
+import webob
+
+from nova.api.openstack.v2.contrib import security_groups
+import nova.db
 from nova import exception
 from nova import test
-from nova.api.openstack.contrib import security_groups
 from nova.tests.api.openstack import fakes
 
 
diff --git a/nova/tests/api/openstack/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/v2/contrib/test_simple_tenant_usage.py
index 2430b9d51..56e7be0d2 100644
--- a/nova/tests/api/openstack/contrib/test_simple_tenant_usage.py
+++ b/nova/tests/api/openstack/v2/contrib/test_simple_tenant_usage.py
@@ -19,10 +19,10 @@ import datetime
 import json
 import webob
 
+from nova.compute import api
 from nova import context
 from nova import flags
 from nova import test
-from nova.compute import api
 from nova.tests.api.openstack import fakes
 
 
diff --git a/nova/tests/api/openstack/contrib/test_virtual_interfaces.py b/nova/tests/api/openstack/v2/contrib/test_virtual_interfaces.py
index 0e3b45c10..4285eaaaf 100644
--- a/nova/tests/api/openstack/contrib/test_virtual_interfaces.py
+++ b/nova/tests/api/openstack/v2/contrib/test_virtual_interfaces.py
@@ -14,13 +14,14 @@
 #    under the License.
 
 import json
+
 import webob
 
-from nova import test
+from nova.api.openstack.v2.contrib.virtual_interfaces import \
+    ServerVirtualInterfaceController
 from nova import network
+from nova import test
 from nova.tests.api.openstack import fakes
-from nova.api.openstack.contrib.virtual_interfaces import \
-    ServerVirtualInterfaceController
 
 
 def get_vifs_by_instance(self, context, server_id):
diff --git a/nova/tests/api/openstack/contrib/test_volume_types.py b/nova/tests/api/openstack/v2/contrib/test_volume_types.py
index ec1c44854..9da77349d 100644
--- a/nova/tests/api/openstack/contrib/test_volume_types.py
+++ b/nova/tests/api/openstack/v2/contrib/test_volume_types.py
@@ -14,18 +14,20 @@
 #    under the License.
 
 import json
+
 import stubout
 import webob
 
+from nova.api.openstack.v2.contrib import volumetypes
 from nova import exception
 from nova import context
 from nova import test
 from nova import log as logging
-from nova.api.openstack.contrib import volumetypes
 from nova.volume import volume_types
 from nova.tests.api.openstack import fakes
 
-LOG = logging.getLogger('nova.tests.api.openstack.test_volume_types')
+LOG = logging.getLogger('nova.tests.api.openstack.v2.contrib.'
+                        'test_volume_types')
 
 last_param = {}
 
diff --git a/nova/tests/api/openstack/contrib/test_volume_types_extra_specs.py b/nova/tests/api/openstack/v2/contrib/test_volume_types_extra_specs.py
index 796478838..9083d9d72 100644
--- a/nova/tests/api/openstack/contrib/test_volume_types_extra_specs.py
+++ b/nova/tests/api/openstack/v2/contrib/test_volume_types_extra_specs.py
@@ -18,15 +18,14 @@
 #    under the License.
 
 import json
-import stubout
-import webob
 import os.path
 
+import stubout
+import webob
 
+from nova.api.openstack.v2 import extensions
+from nova.api.openstack.v2.contrib import volumetypes
 from nova import test
-from nova.api import openstack
-from nova.api.openstack import extensions
-from nova.api.openstack.contrib import volumetypes
 from nova.tests.api.openstack import fakes
 import nova.wsgi
 
diff --git a/nova/tests/api/openstack/contrib/test_volumes.py b/nova/tests/api/openstack/v2/contrib/test_volumes.py
index a130d1140..529abf225 100644
--- a/nova/tests/api/openstack/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/v2/contrib/test_volumes.py
@@ -15,12 +15,13 @@
 
 import datetime
 import json
+
 import webob
 
 import nova
+from nova.compute import instance_types
 from nova import flags
 from nova import test
-from nova.compute import instance_types
 from nova.tests.api.openstack import fakes
 
 
diff --git a/nova/tests/api/openstack/contrib/test_vsa.py b/nova/tests/api/openstack/v2/contrib/test_vsa.py
index 6f6ea8e32..b4055a204 100644
--- a/nova/tests/api/openstack/contrib/test_vsa.py
+++ b/nova/tests/api/openstack/v2/contrib/test_vsa.py
@@ -14,27 +14,26 @@
 #    under the License.
 
 import json
-import stubout
 import unittest
+
+import stubout
 import webob
 
+from nova.api.openstack.v2.contrib.virtual_storage_arrays import _vsa_view
 from nova import context
-from nova import db
+import nova.db
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
+from nova.tests.api.openstack import fakes
 from nova import volume
 from nova import vsa
-from nova.api import openstack
-from nova.tests.api.openstack import fakes
-import nova.wsgi
 
-from nova.api.openstack.contrib.virtual_storage_arrays import _vsa_view
 
 FLAGS = flags.FLAGS
 
-LOG = logging.getLogger('nova.tests.api.openstack.vsa')
+LOG = logging.getLogger('nova.tests.api.openstack.v2.contrib.test_vsa')
 
 last_param = {}
 
diff --git a/nova/tests/api/openstack/extensions/__init__.py b/nova/tests/api/openstack/v2/extensions/__init__.py
index 848908a95..848908a95 100644
--- a/nova/tests/api/openstack/extensions/__init__.py
+++ b/nova/tests/api/openstack/v2/extensions/__init__.py
diff --git a/nova/tests/api/openstack/extensions/foxinsocks.py b/nova/tests/api/openstack/v2/extensions/foxinsocks.py
index cbf101f47..05a995496 100644
--- a/nova/tests/api/openstack/extensions/foxinsocks.py
+++ b/nova/tests/api/openstack/v2/extensions/foxinsocks.py
@@ -18,7 +18,7 @@
 import json
 import webob.exc
 
-from nova.api.openstack import extensions
+from nova.api.openstack.v2 import extensions
 
 
 class FoxInSocksController(object):
diff --git a/nova/tests/api/openstack/test_accounts.py b/nova/tests/api/openstack/v2/test_accounts.py
index ea96e1348..ab3ecafde 100644
--- a/nova/tests/api/openstack/test_accounts.py
+++ b/nova/tests/api/openstack/v2/test_accounts.py
@@ -20,7 +20,7 @@ from lxml import etree
 import webob
 
 from nova import test
-from nova.api.openstack import accounts
+from nova.api.openstack.v2 import accounts
 from nova.auth.manager import User
 from nova.tests.api.openstack import fakes
 
diff --git a/nova/tests/api/openstack/test_api.py b/nova/tests/api/openstack/v2/test_api.py
index b7a0b01ef..318c03a88 100644
--- a/nova/tests/api/openstack/test_api.py
+++ b/nova/tests/api/openstack/v2/test_api.py
@@ -17,15 +17,14 @@
 
 import json
 
+from lxml import etree
 import webob.exc
 import webob.dec
-
-from lxml import etree
 from webob import Request
 
 from nova import test
-from nova.api import openstack
-from nova.api.openstack import faults
+from nova.api.openstack import v2
+from nova.api.openstack.v2 import wsgi
 from nova.tests.api.openstack import fakes
 
 
@@ -33,7 +32,7 @@ class APITest(test.TestCase):
 
     def _wsgi_app(self, inner_app):
         # simpler version of the app than fakes.wsgi_app
-        return openstack.FaultWrapper(inner_app)
+        return v2.FaultWrapper(inner_app)
 
     def test_malformed_json(self):
         req = webob.Request.blank('/')
@@ -94,7 +93,7 @@ class APITest(test.TestCase):
         @webob.dec.wsgify
         def raise_api_fault(req):
             exc = webob.exc.HTTPNotFound(explanation='Raised a webob.exc')
-            return faults.Fault(exc)
+            return wsgi.Fault(exc)
 
         #api.application = succeed
         api = self._wsgi_app(succeed)
diff --git a/nova/tests/api/openstack/test_auth.py b/nova/tests/api/openstack/v2/test_auth.py
index d6a52d4f0..05058c555 100644
--- a/nova/tests/api/openstack/test_auth.py
+++ b/nova/tests/api/openstack/v2/test_auth.py
@@ -20,8 +20,8 @@ import datetime
 import webob
 import webob.dec
 
-import nova.api
-import nova.api.openstack.auth
+import nova.api.openstack.v2
+import nova.api.openstack.v2.auth
 import nova.auth.manager
 from nova import context
 from nova import db
@@ -33,7 +33,7 @@ class Test(test.TestCase):
 
     def setUp(self):
         super(Test, self).setUp()
-        self.stubs.Set(nova.api.openstack.auth.AuthMiddleware,
+        self.stubs.Set(nova.api.openstack.v2.auth.AuthMiddleware,
             '__init__', fakes.fake_auth_init)
         self.stubs.Set(context, 'RequestContext', fakes.FakeRequestContext)
         fakes.FakeAuthManager.clear_fakes()
@@ -80,7 +80,7 @@ class Test(test.TestCase):
         self.assertEqual(result.headers['X-Storage-Url'], "")
 
         token = result.headers['X-Auth-Token']
-        self.stubs.Set(nova.api.openstack, 'APIRouter', fakes.FakeRouter)
+        self.stubs.Set(nova.api.openstack.v2, 'APIRouter', fakes.FakeRouter)
         req = webob.Request.blank('/v1.1/user1_project')
         req.headers['X-Auth-Token'] = token
         result = req.get_response(fakes.wsgi_app(fake_auth=False))
@@ -125,7 +125,7 @@ class Test(test.TestCase):
         self.assertEqual(result.status, '204 No Content')
 
         token = result.headers['X-Auth-Token']
-        self.stubs.Set(nova.api.openstack, 'APIRouter', fakes.FakeRouter)
+        self.stubs.Set(nova.api.openstack.v2, 'APIRouter', fakes.FakeRouter)
         req = webob.Request.blank('/v1.1/user2_project')
         req.headers['X-Auth-Token'] = token
         result = req.get_response(fakes.wsgi_app(fake_auth=False))
@@ -178,7 +178,7 @@ class Test(test.TestCase):
         self.assertEqual(result.status, '204 No Content')
 
         token = result.headers['X-Auth-Token']
-        self.stubs.Set(nova.api.openstack, 'APIRouter', fakes.FakeRouter)
+        self.stubs.Set(nova.api.openstack.v2, 'APIRouter', fakes.FakeRouter)
         req = webob.Request.blank('/v1.1/user2_project')
         req.headers['X-Auth-Token'] = token
         result = req.get_response(fakes.wsgi_app(fake_auth=False))
@@ -201,7 +201,7 @@ class Test(test.TestCase):
         self.assertEqual(result.status, '204 No Content')
 
         token = result.headers['X-Auth-Token']
-        self.stubs.Set(nova.api.openstack, 'APIRouter', fakes.FakeRouter)
+        self.stubs.Set(nova.api.openstack.v2, 'APIRouter', fakes.FakeRouter)
         req = webob.Request.blank('/v1.1/user2_project')
         req.headers['X-Auth-Token'] = token
         result = req.get_response(fakes.wsgi_app(fake_auth=False))
@@ -238,7 +238,7 @@ class TestFunctional(test.TestCase):
 class TestLimiter(test.TestCase):
     def setUp(self):
         super(TestLimiter, self).setUp()
-        self.stubs.Set(nova.api.openstack.auth.AuthMiddleware,
+        self.stubs.Set(nova.api.openstack.v2.auth.AuthMiddleware,
             '__init__', fakes.fake_auth_init)
         self.stubs.Set(context, 'RequestContext', fakes.FakeRequestContext)
         fakes.FakeAuthManager.clear_fakes()
@@ -262,7 +262,7 @@ class TestLimiter(test.TestCase):
         self.assertEqual(len(result.headers['X-Auth-Token']), 40)
 
         token = result.headers['X-Auth-Token']
-        self.stubs.Set(nova.api.openstack, 'APIRouter', fakes.FakeRouter)
+        self.stubs.Set(nova.api.openstack.v2, 'APIRouter', fakes.FakeRouter)
         req = webob.Request.blank('/v1.1/test')
         req.method = 'POST'
         req.headers['X-Auth-Token'] = token
diff --git a/nova/tests/api/openstack/test_consoles.py b/nova/tests/api/openstack/v2/test_consoles.py
index 0b682be0a..fc6479f91 100644
--- a/nova/tests/api/openstack/test_consoles.py
+++ b/nova/tests/api/openstack/v2/test_consoles.py
@@ -22,7 +22,7 @@ import json
 from lxml import etree
 import webob
 
-from nova.api.openstack import consoles
+from nova.api.openstack.v2 import consoles
 from nova import console
 from nova import db
 from nova.compute import vm_states
diff --git a/nova/tests/api/openstack/test_extensions.py b/nova/tests/api/openstack/v2/test_extensions.py
index b4fe3e730..5d388ddd3 100644
--- a/nova/tests/api/openstack/test_extensions.py
+++ b/nova/tests/api/openstack/v2/test_extensions.py
@@ -17,19 +17,20 @@
 
 import json
 import os.path
+
 import webob
 from lxml import etree
 
+from nova.api.openstack import v2
+from nova.api.openstack.v2 import extensions
+from nova.api.openstack.v2 import flavors
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
 from nova import context
 from nova import flags
 from nova import test
-from nova import wsgi as base_wsgi
-from nova.api import openstack
-from nova.api.openstack import extensions
-from nova.api.openstack import flavors
-from nova.api.openstack import wsgi
-from nova.api.openstack import xmlutil
 from nova.tests.api.openstack import fakes
+from nova import wsgi as base_wsgi
 
 FLAGS = flags.FLAGS
 
@@ -88,7 +89,7 @@ class ExtensionTestCase(test.TestCase):
     def setUp(self):
         super(ExtensionTestCase, self).setUp()
         ext_list = FLAGS.osapi_extension[:]
-        ext_list.append('nova.tests.api.openstack.extensions.'
+        ext_list.append('nova.tests.api.openstack.v2.extensions.'
                         'foxinsocks.Foxinsocks')
         self.flags(osapi_extension=ext_list)
 
@@ -123,7 +124,7 @@ class ExtensionControllerTest(ExtensionTestCase):
         self.ext_list.sort()
 
     def test_list_extensions_json(self):
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/extensions")
@@ -150,7 +151,7 @@ class ExtensionControllerTest(ExtensionTestCase):
         )
 
     def test_get_extension_json(self):
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/extensions/FOXNSOX")
@@ -167,14 +168,14 @@ class ExtensionControllerTest(ExtensionTestCase):
                 "links": []})
 
     def test_get_non_existing_extension_json(self):
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         request = webob.Request.blank("/123/extensions/4")
         response = request.get_response(ext_midware)
         self.assertEqual(404, response.status_int)
 
     def test_list_extensions_xml(self):
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/extensions")
@@ -202,7 +203,7 @@ class ExtensionControllerTest(ExtensionTestCase):
         xmlutil.validate_schema(root, 'extensions')
 
     def test_get_extension_xml(self):
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/extensions/FOXNSOX")
@@ -229,7 +230,7 @@ class ResourceExtensionTest(ExtensionTestCase):
 
     def test_no_extension_present(self):
         manager = StubExtensionManager(None)
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app, manager)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/blah")
@@ -240,7 +241,7 @@ class ResourceExtensionTest(ExtensionTestCase):
         res_ext = extensions.ResourceExtension('tweedles',
                                                StubController(response_body))
         manager = StubExtensionManager(res_ext)
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app, manager)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/tweedles")
@@ -252,7 +253,7 @@ class ResourceExtensionTest(ExtensionTestCase):
         res_ext = extensions.ResourceExtension('tweedles',
                                                StubController(response_body))
         manager = StubExtensionManager(res_ext)
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app, manager)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/tweedles")
@@ -264,7 +265,7 @@ class ResourceExtensionTest(ExtensionTestCase):
         res_ext = extensions.ResourceExtension('tweedles',
                                                StubController(response_body))
         manager = StubExtensionManager(res_ext)
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app, manager)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/tweedles")
@@ -285,7 +286,7 @@ class ResourceExtensionTest(ExtensionTestCase):
         res_ext = extensions.ResourceExtension('tweedles',
                                                StubController(response_body))
         manager = StubExtensionManager(res_ext)
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app, manager)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/tweedles/1")
@@ -312,7 +313,7 @@ class ExtensionManagerTest(ExtensionTestCase):
     response_body = "Try to say this Mr. Knox, sir..."
 
     def test_get_resources(self):
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank("/123/foxnsocks")
@@ -323,7 +324,7 @@ class ExtensionManagerTest(ExtensionTestCase):
     def test_invalid_extensions(self):
         # Don't need the serialization middleware here because we're
         # not testing any serialization
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         ext_mgr = ext_midware.ext_mgr
         ext_mgr.register(InvalidExtension())
@@ -334,7 +335,7 @@ class ExtensionManagerTest(ExtensionTestCase):
 class ActionExtensionTest(ExtensionTestCase):
 
     def _send_server_action_request(self, url, body):
-        app = openstack.APIRouter()
+        app = v2.APIRouter()
         ext_midware = extensions.ExtensionMiddleware(app)
         ser_midware = wsgi.LazySerializationMiddleware(ext_midware)
         request = webob.Request.blank(url)
diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/v2/test_flavors.py
index 24d81ef67..c62291ad1 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/v2/test_flavors.py
@@ -20,7 +20,7 @@ import json
 from lxml import etree
 import webob
 
-from nova.api.openstack import flavors
+from nova.api.openstack.v2 import flavors
 from nova.api.openstack import xmlutil
 import nova.compute.instance_types
 from nova import exception
diff --git a/nova/tests/api/openstack/test_image_metadata.py b/nova/tests/api/openstack/v2/test_image_metadata.py
index dc0cf1671..a4f2f155d 100644
--- a/nova/tests/api/openstack/test_image_metadata.py
+++ b/nova/tests/api/openstack/v2/test_image_metadata.py
@@ -18,11 +18,10 @@
 import json
 import webob
 
-
-from nova.tests.api.openstack import fakes
-from nova.api.openstack import image_metadata
+from nova.api.openstack.v2 import image_metadata
 from nova import flags
 from nova import test
+from nova.tests.api.openstack import fakes
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/v2/test_images.py
index eb200046f..b02b6ff2d 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/v2/test_images.py
@@ -20,14 +20,15 @@ Tests of the new image services, both as a service layer,
 and as a WSGI layer
 """
 
+import urlparse
+
 from lxml import etree
 import stubout
-import urlparse
 import webob
 
-from nova.api.openstack import images
+from nova.api.openstack.v2 import images
+from nova.api.openstack.v2.views import images as images_view
 from nova.api.openstack import xmlutil
-from nova.api.openstack.views import images as images_view
 from nova import test
 from nova import utils
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/test_limits.py b/nova/tests/api/openstack/v2/test_limits.py
index 96e30f756..e167f450c 100644
--- a/nova/tests/api/openstack/test_limits.py
+++ b/nova/tests/api/openstack/v2/test_limits.py
@@ -19,19 +19,20 @@ Tests dealing with HTTP rate-limiting.
 
 import httplib
 import json
-from lxml import etree
 import StringIO
-import stubout
 import time
 import unittest
-import webob
 from xml.dom import minidom
 
-import nova.context
-from nova.api.openstack import limits
-from nova.api.openstack import views
+from lxml import etree
+import stubout
+import webob
+
+from nova.api.openstack.v2 import limits
+from nova.api.openstack.v2 import views
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+import nova.context
 from nova import test
 
 
diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/v2/test_server_actions.py
index 9d50483b8..3adde3b7a 100644
--- a/nova/tests/api/openstack/test_server_actions.py
+++ b/nova/tests/api/openstack/v2/test_server_actions.py
@@ -1,3 +1,18 @@
+# Copyright 2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 import base64
 import datetime
 import json
@@ -5,17 +20,17 @@ import json
 import stubout
 import webob
 
-from nova import context
-from nova import utils
-from nova import exception
-from nova import flags
-from nova.api.openstack import servers
+from nova.api.openstack.v2 import servers
 from nova.compute import vm_states
 from nova.compute import instance_types
+from nova import context
 import nova.db
+from nova import exception
+from nova import flags
 from nova import test
 from nova.tests.api.openstack import common
 from nova.tests.api.openstack import fakes
+from nova import utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/api/openstack/test_server_metadata.py b/nova/tests/api/openstack/v2/test_server_metadata.py
index 1e0cba541..49ff1bcd8 100644
--- a/nova/tests/api/openstack/test_server_metadata.py
+++ b/nova/tests/api/openstack/v2/test_server_metadata.py
@@ -18,13 +18,13 @@
 import json
 import webob
 
-from nova.api.openstack import server_metadata
+from nova.api.openstack.v2 import server_metadata
 import nova.db
 from nova import exception
 from nova import flags
 from nova import test
-from nova import utils
 from nova.tests.api.openstack import fakes
+from nova import utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/v2/test_servers.py
index 7eaaaa489..34a5dfa51 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/v2/test_servers.py
@@ -16,35 +16,28 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import base64
 import datetime
 import json
-import unittest
 import urlparse
-from xml.dom import minidom
 
 from lxml import etree
 import webob
 
-import nova.api.openstack
-from nova.api.openstack import servers
-from nova.api.openstack import ips
+import nova.api.openstack.v2
+from nova.api.openstack.v2 import ips
+from nova.api.openstack.v2 import servers
 from nova.api.openstack import xmlutil
 import nova.compute.api
 from nova.compute import instance_types
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import context
-from nova import db
 import nova.db
 from nova.db.sqlalchemy.models import InstanceMetadata
-from nova import exception
 from nova import flags
 import nova.image.fake
 import nova.rpc
 import nova.scheduler.api
 from nova import test
-from nova.tests.api.openstack import common
 from nova.tests.api.openstack import fakes
 from nova import utils
 
@@ -2226,7 +2219,7 @@ class TestServerCreateRequestXMLDeserializer(test.TestCase):
 
 class TestAddressesXMLSerialization(test.TestCase):
 
-    serializer = nova.api.openstack.ips.IPXMLSerializer()
+    serializer = nova.api.openstack.v2.ips.IPXMLSerializer()
 
     def test_xml_declaration(self):
         fixture = {
@@ -2304,7 +2297,7 @@ class ServersViewBuilderTest(test.TestCase):
             include_fake_metadata=False)
 
         self.uuid = self.instance['uuid']
-        self.view_builder = nova.api.openstack.views.servers.ViewBuilder()
+        self.view_builder = nova.api.openstack.v2.views.servers.ViewBuilder()
         self.request = fakes.HTTPRequest.blank("/v1.1")
 
     def test_build_server(self):
diff --git a/nova/tests/api/openstack/test_urlmap.py b/nova/tests/api/openstack/v2/test_urlmap.py
index 3995765e5..61a237347 100644
--- a/nova/tests/api/openstack/test_urlmap.py
+++ b/nova/tests/api/openstack/v2/test_urlmap.py
@@ -16,11 +16,11 @@
 import json
 import webob
 
-from nova import test
 from nova import log as logging
+from nova import test
 from nova.tests.api.openstack import fakes
 
-LOG = logging.getLogger('nova.tests.api.openstack.test_urlmap')
+LOG = logging.getLogger('nova.tests.api.openstack.v2.test_urlmap')
 
 
 class UrlmapTest(test.TestCase):
diff --git a/nova/tests/api/openstack/test_users.py b/nova/tests/api/openstack/v2/test_users.py
index 82fce68ff..454b7cae7 100644
--- a/nova/tests/api/openstack/test_users.py
+++ b/nova/tests/api/openstack/v2/test_users.py
@@ -20,7 +20,7 @@ import webob
 
 from nova import test
 from nova import utils
-from nova.api.openstack import users
+from nova.api.openstack.v2 import users
 from nova.auth.manager import User, Project
 from nova.tests.api.openstack import fakes
 
diff --git a/nova/tests/api/openstack/test_versions.py b/nova/tests/api/openstack/v2/test_versions.py
index a6e30187b..392e31a46 100644
--- a/nova/tests/api/openstack/test_versions.py
+++ b/nova/tests/api/openstack/v2/test_versions.py
@@ -22,8 +22,8 @@ from lxml import etree
 import stubout
 import webob
 
-from nova.api.openstack import versions
-from nova.api.openstack import views
+from nova.api.openstack.v2 import versions
+from nova.api.openstack.v2 import views
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 from nova import context
diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/v2/test_zones.py
index 496c3e8e6..4a3e3ed47 100644
--- a/nova/tests/api/openstack/test_zones.py
+++ b/nova/tests/api/openstack/v2/test_zones.py
@@ -20,15 +20,15 @@ from lxml import etree
 import stubout
 import webob
 
-import nova.db
+from nova.api.openstack.v2 import zones
+from nova.api.openstack import xmlutil
 from nova import context
 from nova import crypto
+import nova.db
 from nova import flags
+from nova.scheduler import api
 from nova import test
-from nova.api.openstack import xmlutil
-from nova.api.openstack import zones
 from nova.tests.api.openstack import fakes
-from nova.scheduler import api
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py
index 958f584ab..4318e30f2 100644
--- a/nova/tests/integrated/test_extensions.py
+++ b/nova/tests/integrated/test_extensions.py
@@ -30,7 +30,7 @@ class ExtensionsTest(integrated_helpers._IntegratedTestBase):
     def _get_flags(self):
         f = super(ExtensionsTest, self)._get_flags()
         f['osapi_extension'] = FLAGS.osapi_extension[:]
-        f['osapi_extension'].append('nova.tests.api.openstack.extensions.'
+        f['osapi_extension'].append('nova.tests.api.openstack.v2.extensions.'
                                     'foxinsocks.Foxinsocks')
         return f
 
diff --git a/nova/tests/test_hosts.py b/nova/tests/test_hosts.py
index becc74cdd..32fb5d2cf 100644
--- a/nova/tests/test_hosts.py
+++ b/nova/tests/test_hosts.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
 import webob.exc
 
 from nova import context
@@ -21,7 +20,7 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
-from nova.api.openstack.contrib import hosts as os_hosts
+from nova.api.openstack.v2.contrib import hosts as os_hosts
 from nova.scheduler import api as scheduler_api