Move V2 API unittests under legacy_v2 directory

This patch moves the v2-specific tests in nova/tests/unit/api/openstack/compute into new 'legacy_v2' directory Partial-Bug: #1462901 Change-Id: I2de134c91309ddbe1e16a8ab07e06678d92ab32b
j-carpentier · Aug 13, 2015 · 7449043 · 7449043
1 parent f65ffa2
commit 7449043
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 4 deletions.
diff --git a/nova/tests/functional/test_extensions.py b/nova/tests/functional/test_extensions.py
@@ -30,7 +30,7 @@ def _get_flags(self):
         f = super(ExtensionsTest, self)._get_flags()
         f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
         f['osapi_compute_extension'].append(
-            'nova.tests.unit.api.openstack.compute.extensions.'
+            'nova.tests.unit.api.openstack.compute.legacy_v2.extensions.'
             'foxinsocks.Foxinsocks')
         return f
 

diff --git a/.../openstack/compute/extensions/__init__.py → ...i/openstack/compute/legacy_v2/__init__.py b/.../openstack/compute/extensions/__init__.py → ...i/openstack/compute/legacy_v2/__init__.py
diff --git a/nova/tests/unit/api/openstack/compute/legacy_v2/extensions/__init__.py b/nova/tests/unit/api/openstack/compute/legacy_v2/extensions/__init__.py
diff --git a/...penstack/compute/extensions/foxinsocks.py → ...ompute/legacy_v2/extensions/foxinsocks.py b/...penstack/compute/extensions/foxinsocks.py → ...ompute/legacy_v2/extensions/foxinsocks.py
diff --git a/...s/unit/api/openstack/compute/test_auth.py → .../openstack/compute/legacy_v2/test_auth.py b/...s/unit/api/openstack/compute/test_auth.py → .../openstack/compute/legacy_v2/test_auth.py
diff --git a/.../api/openstack/compute/test_extensions.py → ...tack/compute/legacy_v2/test_extensions.py b/.../api/openstack/compute/test_extensions.py → ...tack/compute/legacy_v2/test_extensions.py
@@ -135,7 +135,7 @@ class ExtensionTestCase(test.TestCase):
     def setUp(self):
         super(ExtensionTestCase, self).setUp()
         ext_list = CONF.osapi_compute_extension[:]
-        fox = ('nova.tests.unit.api.openstack.compute.extensions.'
+        fox = ('nova.tests.unit.api.openstack.compute.legacy_v2.extensions.'
                'foxinsocks.Foxinsocks')
         if fox not in ext_list:
             ext_list.append(fox)

diff --git a/...nit/api/openstack/compute/test_servers.py → ...enstack/compute/legacy_v2/test_servers.py b/...nit/api/openstack/compute/test_servers.py → ...enstack/compute/legacy_v2/test_servers.py
@@ -260,7 +260,7 @@ def test_requested_networks_api_enabled_with_v2_subclass(self):
         self.assertEqual([(None, None, port, None)], res.as_tuples())
 
     def test_requested_networks_neutronv2_subclass_with_port(self):
-        cls = ('nova.tests.unit.api.openstack.compute' +
+        cls = ('nova.tests.unit.api.openstack.compute.legacy_v2'
                '.test_servers.NeutronV2Subclass')
         self.flags(network_api_class=cls)
         port = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'

diff --git a/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py
@@ -300,7 +300,7 @@ def test_requested_networks_api_enabled_with_v2_subclass(self):
         self.assertEqual([(None, None, port, None)], res.as_tuples())
 
     def test_requested_networks_neutronv2_subclass_with_port(self):
-        cls = ('nova.tests.unit.api.openstack.compute' +
+        cls = ('nova.tests.unit.api.openstack.compute.plugins.v3'
                '.test_servers.NeutronV2Subclass')
         self.flags(network_api_class=cls)
         port = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'