openstack
/
nova
Code Issues Proposed changes

Change v3 import to v21 in 2.1 api unit test 

Change v3 import to v21 in 2.1 api unit test,
make the import name consistence.

Partially implements blueprint v2-on-v3-api

Change-Id: Ib9b6d5e933980067288115d2acaa8ce583a3cf35
This commit is contained in:
yuntong 2015-02-27 10:25:11 +08:00 committed by yuntongjin
parent afc2e675d7
commit 01f8669604
10 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/unit/api/openstack/compute/contrib/test_attach_interfaces.py
View File

@ -19,7 +19,7 @@ from oslo_config import cfg
from nova.api.openstack.compute.contrib import attach_interfaces \
as attach_interfaces_v2
from nova.api.openstack.compute.plugins.v3 import attach_interfaces \
as attach_interfaces_v3
as attach_interfaces_v21
from nova.compute import api as compute_api
from nova import exception
from nova.network import api as network_api
@ -127,7 +127,7 @@ def fake_get_instance(self, *args, **kwargs):
class InterfaceAttachTestsV21(test.NoDBTestCase):
controller_cls = attach_interfaces_v3.InterfaceAttachmentController
controller_cls = attach_interfaces_v21.InterfaceAttachmentController
validate_exc = exception.ValidationError
in_use_exc = exc.HTTPConflict
not_found_exc = exc.HTTPNotFound
@ -195,7 +195,7 @@ class InterfaceAttachTestsV21(test.NoDBTestCase):
# NOTE: on v2.1, http status code is set as wsgi_code of API
# method instead of status_int in a response object.
if isinstance(self.attachments,
attach_interfaces_v3.InterfaceAttachmentController):
attach_interfaces_v21.InterfaceAttachmentController):
status_int = self.attachments.delete.wsgi_code
else:
status_int = result.status_int

7
nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping.py
View File

@ -22,7 +22,7 @@ from webob import exc
from nova.api.openstack.compute import extensions
from nova.api.openstack.compute import plugins
from nova.api.openstack.compute.plugins.v3 import block_device_mapping
from nova.api.openstack.compute.plugins.v3 import servers as servers_v3
from nova.api.openstack.compute.plugins.v3 import servers as servers_v21
from nova.api.openstack.compute import servers as servers_v2
from nova import block_device
from nova.compute import api as compute_api
@ -41,10 +41,11 @@ class BlockDeviceMappingTestV21(test.TestCase):
def _setup_controller(self):
ext_info = plugins.LoadedExtensionInfo()
self.controller = servers_v3.ServersController(extension_info=ext_info)
self.controller = servers_v21.ServersController(
extension_info=ext_info)
CONF.set_override('extensions_blacklist', 'os-block-device-mapping',
'osapi_v3')
self.no_bdm_v2_controller = servers_v3.ServersController(
self.no_bdm_v2_controller = servers_v21.ServersController(
extension_info=ext_info)
CONF.set_override('extensions_blacklist', '', 'osapi_v3')

11
nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py
View File

@ -23,7 +23,7 @@ from nova.api.openstack.compute import extensions
from nova.api.openstack.compute import plugins
from nova.api.openstack.compute.plugins.v3 import block_device_mapping_v1 as \
block_device_mapping
from nova.api.openstack.compute.plugins.v3 import servers as servers_v3
from nova.api.openstack.compute.plugins.v3 import servers as servers_v21
from nova.api.openstack.compute import servers as servers_v2
from nova.compute import api as compute_api
from nova import exception
@ -41,12 +41,13 @@ class BlockDeviceMappingTestV21(test.TestCase):
ext_info = plugins.LoadedExtensionInfo()
CONF.set_override('extensions_blacklist', 'os-block-device-mapping',
'osapi_v3')
self.controller = servers_v3.ServersController(extension_info=ext_info)
self.controller = servers_v21.ServersController(
extension_info=ext_info)
CONF.set_override('extensions_blacklist',
['os-block-device-mapping-v1',
'os-block-device-mapping'],
'osapi_v3')
self.no_volumes_controller = servers_v3.ServersController(
self.no_volumes_controller = servers_v21.ServersController(
extension_info=ext_info)
CONF.set_override('extensions_blacklist', '', 'osapi_v3')
@ -302,7 +303,7 @@ class BlockDeviceMappingTestV21(test.TestCase):
['os-block-device-mapping',
'os-block-device-mapping-v1'],
'osapi_v3')
controller = servers_v3.ServersController(extension_info=ext_info)
controller = servers_v21.ServersController(extension_info=ext_info)
bdm = [{'device_name': 'foo1',
'volume_id': fakes.FAKE_UUID,
'delete_on_termination': True}]
@ -331,7 +332,7 @@ class BlockDeviceMappingTestV21(test.TestCase):
def test_create_instance_both_bdm_formats(self):
ext_info = plugins.LoadedExtensionInfo()
CONF.set_override('extensions_blacklist', '', 'osapi_v3')
both_controllers = servers_v3.ServersController(
both_controllers = servers_v21.ServersController(
extension_info=ext_info)
bdm = [{'device_name': 'foo'}]
bdm_v2 = [{'source_type': 'volume',

8
nova/tests/unit/api/openstack/compute/contrib/test_flavor_access.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack.compute.contrib import flavor_access \
as flavor_access_v2
from nova.api.openstack.compute import flavors as flavors_api
from nova.api.openstack.compute.plugins.v3 import flavor_access \
as flavor_access_v3
as flavor_access_v21
from nova import context
from nova import db
from nova import exception
@ -123,8 +123,8 @@ class FakeResponse(object):
class FlavorAccessTestV21(test.NoDBTestCase):
api_version = "2.1"
FlavorAccessController = flavor_access_v3.FlavorAccessController
FlavorActionController = flavor_access_v3.FlavorActionController
FlavorAccessController = flavor_access_v21.FlavorAccessController
FlavorActionController = flavor_access_v21.FlavorActionController
_prefix = "/v3"
validation_ex = exception.ValidationError
@ -170,7 +170,7 @@ class FlavorAccessTestV21(test.NoDBTestCase):
raise exception.PolicyNotAuthorized(action='index')
if self.api_version == "2.1":
self.stubs.Set(flavor_access_v3,
self.stubs.Set(flavor_access_v21,
'authorize',
fake_authorize)
else:

4
nova/tests/unit/api/openstack/compute/contrib/test_hosts.py
View File

@ -17,7 +17,7 @@ import testtools
import webob.exc
from nova.api.openstack.compute.contrib import hosts as os_hosts_v2
from nova.api.openstack.compute.plugins.v3 import hosts as os_hosts_v3
from nova.api.openstack.compute.plugins.v3 import hosts as os_hosts_v21
from nova.compute import power_state
from nova.compute import vm_states
from nova import context as context_maker
@ -144,7 +144,7 @@ class FakeRequestWithInvalidNovaService(object):
class HostTestCaseV21(test.TestCase):
"""Test Case for hosts."""
validation_ex = exception.ValidationError
Controller = os_hosts_v3.HostController
Controller = os_hosts_v21.HostController
policy_ex = exception.PolicyNotAuthorized
def _setup_stubs(self):

6
nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py
View File

@ -17,7 +17,7 @@ from oslo_config import cfg
import webob
from nova.api.openstack.compute.contrib import server_groups
from nova.api.openstack.compute.plugins.v3 import server_groups as sg_v3
from nova.api.openstack.compute.plugins.v3 import server_groups as sg_v21
from nova.api.openstack import extensions
from nova import context
import nova.db
@ -79,7 +79,7 @@ class ServerGroupQuotasTestV21(test.TestCase):
self.req = fakes.HTTPRequest.blank('')
def _setup_controller(self):
self.controller = sg_v3.ServerGroupController()
self.controller = sg_v21.ServerGroupController()
def _setup_quotas(self):
pass
@ -156,7 +156,7 @@ class ServerGroupQuotasTestV21(test.TestCase):
# NOTE: on v2.1, http status code is set as wsgi_code of API
# method instead of status_int in a response object.
if isinstance(self.controller, sg_v3.ServerGroupController):
if isinstance(self.controller, sg_v21.ServerGroupController):
status_int = self.controller.delete.wsgi_code
else:
status_int = resp.status_int

6
nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py
View File

@ -16,7 +16,7 @@
import webob
from nova.api.openstack.compute.contrib import server_groups
from nova.api.openstack.compute.plugins.v3 import server_groups as sg_v3
from nova.api.openstack.compute.plugins.v3 import server_groups as sg_v21
from nova.api.openstack import extensions
from nova import context
import nova.db
@ -86,7 +86,7 @@ class ServerGroupTestV21(test.TestCase):
self.req = fakes.HTTPRequest.blank('')
def _setup_controller(self):
self.controller = sg_v3.ServerGroupController()
self.controller = sg_v21.ServerGroupController()
def test_create_server_group_with_no_policies(self):
sgroup = server_group_template()
@ -332,7 +332,7 @@ class ServerGroupTestV21(test.TestCase):
# NOTE: on v2.1, http status code is set as wsgi_code of API
# method instead of status_int in a response object.
if isinstance(self.controller, sg_v3.ServerGroupController):
if isinstance(self.controller, sg_v21.ServerGroupController):
status_int = self.controller.delete.wsgi_code
else:
status_int = resp.status_int

12
nova/tests/unit/api/openstack/compute/contrib/test_volumes.py
View File

@ -27,7 +27,7 @@ from nova.api.openstack.compute.contrib import assisted_volume_snapshots as \
from nova.api.openstack.compute.contrib import volumes
from nova.api.openstack.compute.plugins.v3 import assisted_volume_snapshots as \
assisted_snaps_v21
from nova.api.openstack.compute.plugins.v3 import volumes as volumes_v3
from nova.api.openstack.compute.plugins.v3 import volumes as volumes_v21
from nova.api.openstack import extensions
from nova.compute import api as compute_api
from nova.compute import flavors
@ -359,7 +359,7 @@ class VolumeAttachTestsV21(test.NoDBTestCase):
self._set_up_controller()
def _set_up_controller(self):
self.attachments = volumes_v3.VolumeAttachmentController()
self.attachments = volumes_v21.VolumeAttachmentController()
def test_show(self):
req = fakes.HTTPRequest.blank(
@ -434,7 +434,7 @@ class VolumeAttachTestsV21(test.NoDBTestCase):
# NOTE: on v2.1, http status code is set as wsgi_code of API
# method instead of status_int in a response object.
if isinstance(self.attachments,
volumes_v3.VolumeAttachmentController):
volumes_v21.VolumeAttachmentController):
status_int = self.attachments.delete.wsgi_code
else:
status_int = result.status_int
@ -608,7 +608,7 @@ class VolumeAttachTestsV21(test.NoDBTestCase):
# NOTE: on v2.1, http status code is set as wsgi_code of API
# method instead of status_int in a response object.
if isinstance(self.attachments,
volumes_v3.VolumeAttachmentController):
volumes_v21.VolumeAttachmentController):
status_int = self.attachments.update.wsgi_code
else:
status_int = result.status_int
@ -718,7 +718,7 @@ class BadRequestVolumeTestCaseV21(CommonBadRequestTestCase,
resource = 'os-volumes'
entity_name = 'volume'
controller_cls = volumes_v3.VolumeController
controller_cls = volumes_v21.VolumeController
bad_request = exception.ValidationError
@ -740,7 +740,7 @@ class BadRequestSnapshotTestCaseV21(CommonBadRequestTestCase,
resource = 'os-snapshots'
entity_name = 'snapshot'
controller_cls = volumes_v3.SnapshotController
controller_cls = volumes_v21.SnapshotController
bad_request = exception.ValidationError

8
nova/tests/unit/api/openstack/compute/test_flavors.py
View File

@ -18,7 +18,7 @@ import webob
from nova.api.openstack import common
from nova.api.openstack.compute import flavors as flavors_v2
from nova.api.openstack.compute.plugins.v3 import flavors as flavors_v3
from nova.api.openstack.compute.plugins.v3 import flavors as flavors_v21
import nova.compute.flavors
from nova import context
from nova import db
@ -113,7 +113,7 @@ def return_flavor_not_found(flavor_id, ctxt=None):
class FlavorsTestV21(test.TestCase):
_prefix = "/v3"
Controller = flavors_v3.FlavorsController
Controller = flavors_v21.FlavorsController
fake_request = fakes.HTTPRequestV3
_rspv = "v3"
_fake = ""
@ -577,7 +577,7 @@ class FlavorsTestV20(FlavorsTestV21):
class DisabledFlavorsWithRealDBTestV21(test.TestCase):
"""Tests that disabled flavors should not be shown nor listed."""
Controller = flavors_v3.FlavorsController
Controller = flavors_v21.FlavorsController
_prefix = "/v3"
fake_request = fakes.HTTPRequestV3
@ -672,7 +672,7 @@ class DisabledFlavorsWithRealDBTestV20(DisabledFlavorsWithRealDBTestV21):
class ParseIsPublicTestV21(test.TestCase):
Controller = flavors_v3.FlavorsController
Controller = flavors_v21.FlavorsController
def setUp(self):
super(ParseIsPublicTestV21, self).setUp()

4
nova/tests/unit/api/openstack/compute/test_limits.py
View File

@ -26,7 +26,7 @@ import six
import webob
from nova.api.openstack.compute import limits
from nova.api.openstack.compute.plugins.v3 import limits as limits_v3
from nova.api.openstack.compute.plugins.v3 import limits as limits_v21
from nova.api.openstack.compute import views
from nova.api.openstack import wsgi
import nova.context
@ -75,7 +75,7 @@ class BaseLimitTestSuite(test.NoDBTestCase):
class LimitsControllerTestV21(BaseLimitTestSuite):
"""Tests for `limits.LimitsController` class."""
limits_controller = limits_v3.LimitsController
limits_controller = limits_v21.LimitsController
def setUp(self):
"""Run before each test."""