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
This commit is contained in:
He Jie Xu 2015-08-13 15:46:24 +08:00
parent f65ffa28ff
commit 74490439f8
8 changed files with 4 additions and 4 deletions

View File

@ -30,7 +30,7 @@ class ExtensionsTest(integrated_helpers._IntegratedTestBase):
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

View File

@ -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)

View File

@ -260,7 +260,7 @@ class ServersControllerTest(ControllerTest):
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'

View File

@ -300,7 +300,7 @@ class ServersControllerTest(ControllerTest):
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'