Merge "Replace stubs.Set with stub_out (db)"
This commit is contained in:
commit
2fc930a84e
|
@ -177,10 +177,10 @@ class ControllerTest(test.TestCase):
|
|||
lambda api, *a, **k: return_servers(*a, **k))
|
||||
self.stubs.Set(compute_api.API, 'get',
|
||||
lambda api, *a, **k: return_server(*a, **k))
|
||||
self.stubs.Set(db, 'instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
instance_update_and_get_original)
|
||||
self.stub_out('nova.db.instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
instance_update_and_get_original)
|
||||
|
||||
self.ext_mgr = extensions.ExtensionManager()
|
||||
self.ext_mgr.extensions = {}
|
||||
|
@ -1441,9 +1441,9 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
filtered_dict['uuid'] = id
|
||||
return filtered_dict
|
||||
|
||||
self.stubs.Set(db, 'instance_update', server_update)
|
||||
self.stub_out('nova.db.instance_update', server_update)
|
||||
# FIXME (comstud)
|
||||
# self.stubs.Set(db, 'instance_get',
|
||||
# self.stub_out('nova.db.instance_get',
|
||||
# return_server_with_attributes(name='server_test'))
|
||||
|
||||
req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
|
||||
|
@ -1469,7 +1469,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
def fake_update(*args, **kwargs):
|
||||
raise exception.InstanceNotFound(instance_id='fake')
|
||||
|
||||
self.stubs.Set(db, 'instance_update_and_get_original', fake_update)
|
||||
self.stub_out('nova.db.instance_update_and_get_original', fake_update)
|
||||
body = {'server': {'name': 'server_test'}}
|
||||
req = self._get_request(body)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
|
||||
|
@ -1559,7 +1559,7 @@ class ServersControllerDeleteTest(ControllerTest):
|
|||
def test_delete_server_instance_while_deleting_host_down(self):
|
||||
fake_network.stub_out_network_cleanup(self)
|
||||
req = self._create_delete_request(FAKE_UUID)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
task_state=task_states.DELETING,
|
||||
host='fake_host'))
|
||||
|
@ -1579,7 +1579,7 @@ class ServersControllerDeleteTest(ControllerTest):
|
|||
|
||||
def test_delete_server_instance_while_resize(self):
|
||||
req = self._create_delete_request(FAKE_UUID)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
task_state=task_states.RESIZE_PREP))
|
||||
|
||||
|
@ -1603,7 +1603,7 @@ class ServersControllerDeleteTest(ControllerTest):
|
|||
self.server_delete_called = True
|
||||
deleted_at = timeutils.utcnow()
|
||||
return fake_instance.fake_db_instance(deleted_at=deleted_at)
|
||||
self.stubs.Set(db, 'instance_destroy', instance_destroy_mock)
|
||||
self.stub_out('nova.db.instance_destroy', instance_destroy_mock)
|
||||
|
||||
self.controller.delete(req, FAKE_UUID)
|
||||
# delete() should be called for instance which has never been active,
|
||||
|
@ -1936,16 +1936,14 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
fakes.stub_out_key_pair_funcs(self.stubs)
|
||||
fake.stub_out_image_service(self)
|
||||
self.stubs.Set(uuid, 'uuid4', fake_gen_uuid)
|
||||
self.stubs.Set(db, 'instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stubs.Set(db, 'project_get_networks',
|
||||
project_get_networks)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stubs.Set(db, 'instance_system_metadata_update',
|
||||
fake_method)
|
||||
self.stubs.Set(db, 'instance_get', instance_get)
|
||||
self.stubs.Set(db, 'instance_update', instance_update)
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
self.stub_out('nova.db.instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.project_get_networks', project_get_networks)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_system_metadata_update', fake_method)
|
||||
self.stub_out('nova.db.instance_get', instance_get)
|
||||
self.stub_out('nova.db.instance_update', instance_update)
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
server_update_and_get_original)
|
||||
self.stubs.Set(manager.VlanManager, 'allocate_fixed_ip',
|
||||
fake_method)
|
||||
|
@ -2171,7 +2169,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
self.assertEqual(kwargs['security_group'], [group])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(db, 'security_group_get_by_name', sec_group_get)
|
||||
self.stub_out('nova.db.security_group_get_by_name', sec_group_get)
|
||||
# negative test
|
||||
self.assertRaises(webob.exc.HTTPBadRequest,
|
||||
self._test_create_extra,
|
||||
|
@ -2646,7 +2644,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
self.assertEqual(key_name, kwargs['key_name'])
|
||||
return old_create(*args, **kwargs)
|
||||
|
||||
self.stubs.Set(db, 'key_pair_get', key_pair_get)
|
||||
self.stub_out('nova.db.key_pair_get', key_pair_get)
|
||||
self.stubs.Set(compute_api.API, 'create', create)
|
||||
self._test_create_extra(params)
|
||||
|
||||
|
@ -2899,7 +2897,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
|
||||
self.stubs.Set(fakes.QUOTAS, 'count', fake_count)
|
||||
self.stubs.Set(fakes.QUOTAS, 'limit_check', fake_limit_check)
|
||||
self.stubs.Set(db, 'instance_destroy', fake_instance_destroy)
|
||||
self.stub_out('nova.db.instance_destroy', fake_instance_destroy)
|
||||
self.ext_mgr.extensions = {'OS-SCH-HNT': 'fake',
|
||||
'os-server-group-quotas': 'fake'}
|
||||
self.body['server']['scheduler_hints'] = {'group': fake_group.uuid}
|
||||
|
@ -2923,7 +2921,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
def fake_instance_destroy(context, uuid, constraint):
|
||||
return fakes.stub_instance(1)
|
||||
|
||||
self.stubs.Set(db, 'instance_destroy', fake_instance_destroy)
|
||||
self.stub_out('nova.db.instance_destroy', fake_instance_destroy)
|
||||
self.ext_mgr.extensions = {'OS-SCH-HNT': 'fake',
|
||||
'os-server-group-quotas': 'fake'}
|
||||
self.body['server']['scheduler_hints'] = {'group': test_group.uuid}
|
||||
|
|
|
@ -21,7 +21,6 @@ from nova.api.openstack.compute import servers as servers_v21
|
|||
from nova.api.openstack import extensions as extensions_v20
|
||||
from nova.api.openstack import wsgi
|
||||
from nova.compute import api as compute_api
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.objects import instance as instance_obj
|
||||
from nova import test
|
||||
|
@ -171,7 +170,8 @@ class AccessIPsExtAPIValidationTestV21(test.TestCase):
|
|||
|
||||
self._set_up_controller()
|
||||
fake.stub_out_image_service(self)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fakes.fake_instance_get())
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get())
|
||||
self.stubs.Set(instance_obj.Instance, 'save', fake_save)
|
||||
self.stubs.Set(compute_api.API, 'rebuild', fake_rebuild)
|
||||
|
||||
|
|
|
@ -83,14 +83,10 @@ class AgentsTestV21(test.NoDBTestCase):
|
|||
def setUp(self):
|
||||
super(AgentsTestV21, self).setUp()
|
||||
|
||||
self.stubs.Set(db, "agent_build_get_all",
|
||||
fake_agent_build_get_all)
|
||||
self.stubs.Set(db, "agent_build_update",
|
||||
fake_agent_build_update)
|
||||
self.stubs.Set(db, "agent_build_destroy",
|
||||
fake_agent_build_destroy)
|
||||
self.stubs.Set(db, "agent_build_create",
|
||||
fake_agent_build_create)
|
||||
self.stub_out("nova.db.agent_build_get_all", fake_agent_build_get_all)
|
||||
self.stub_out("nova.db.agent_build_update", fake_agent_build_update)
|
||||
self.stub_out("nova.db.agent_build_destroy", fake_agent_build_destroy)
|
||||
self.stub_out("nova.db.agent_build_create", fake_agent_build_create)
|
||||
self.req = self._get_http_request()
|
||||
|
||||
def _get_http_request(self):
|
||||
|
@ -156,8 +152,8 @@ class AgentsTestV21(test.NoDBTestCase):
|
|||
def fake_agent_build_create_with_exited_agent(context, values):
|
||||
raise exception.AgentBuildExists(**values)
|
||||
|
||||
self.stubs.Set(db, 'agent_build_create',
|
||||
fake_agent_build_create_with_exited_agent)
|
||||
self.stub_out('nova.db.agent_build_create',
|
||||
fake_agent_build_create_with_exited_agent)
|
||||
body = {'agent': {'hypervisor': 'kvm',
|
||||
'os': 'win',
|
||||
'architecture': 'x86',
|
||||
|
|
|
@ -101,7 +101,7 @@ class AvailabilityZoneApiTestV21(test.NoDBTestCase):
|
|||
def setUp(self):
|
||||
super(AvailabilityZoneApiTestV21, self).setUp()
|
||||
availability_zones.reset_cache()
|
||||
self.stubs.Set(db, 'service_get_all', fake_service_get_all)
|
||||
self.stub_out('nova.db.service_get_all', fake_service_get_all)
|
||||
self.stubs.Set(availability_zones, 'set_availability_zones',
|
||||
fake_set_availability_zones)
|
||||
self.stubs.Set(servicegroup.API, 'service_is_up', fake_service_is_up)
|
||||
|
@ -231,7 +231,7 @@ class ServersControllerCreateTestV21(test.TestCase):
|
|||
return instance
|
||||
|
||||
fake.stub_out_image_service(self)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
|
||||
self.req = fakes.HTTPRequest.blank('')
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ import webob
|
|||
from nova.api.openstack.compute import cloudpipe as clup_v21
|
||||
from nova.api.openstack.compute.legacy_v2.contrib import cloudpipe_update \
|
||||
as clup_v2
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -44,8 +43,9 @@ class CloudpipeUpdateTestV21(test.NoDBTestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(CloudpipeUpdateTestV21, self).setUp()
|
||||
self.stubs.Set(db, "project_get_networks", fake_project_get_networks)
|
||||
self.stubs.Set(db, "network_update", fake_network_update)
|
||||
self.stub_out("nova.db.project_get_networks",
|
||||
fake_project_get_networks)
|
||||
self.stub_out("nova.db.network_update", fake_network_update)
|
||||
self._setup()
|
||||
self.req = fakes.HTTPRequest.blank('')
|
||||
|
||||
|
|
|
@ -26,7 +26,6 @@ from nova.api.openstack.compute import servers as servers_v21
|
|||
from nova.api.openstack import extensions
|
||||
from nova.compute import api as compute_api
|
||||
from nova.compute import flavors
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova import test
|
||||
|
@ -52,10 +51,10 @@ class ConfigDriveTestV21(test.TestCase):
|
|||
self._setup_wsgi()
|
||||
|
||||
def test_show(self):
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
fakes.fake_instance_get())
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fakes.fake_instance_get())
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get())
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get())
|
||||
req = webob.Request.blank(self.base_url + '1')
|
||||
req.headers['Content-Type'] = 'application/json'
|
||||
response = req.get_response(self.app)
|
||||
|
@ -143,7 +142,7 @@ class ServersControllerCreateTestV21(test.TestCase):
|
|||
return instance
|
||||
|
||||
fake.stub_out_image_service(self)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
|
||||
def _test_create_extra(self, params, override_controller):
|
||||
image_uuid = 'c905cedb-7281-47e4-8a62-f26bc5fc4c77'
|
||||
|
|
|
@ -25,7 +25,6 @@ from nova.api.openstack.compute import consoles as consoles_v21
|
|||
from nova.api.openstack.compute.legacy_v2 import consoles as consoles_v2
|
||||
from nova.compute import vm_states
|
||||
from nova import console
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import policy
|
||||
from nova import test
|
||||
|
@ -128,10 +127,10 @@ class ConsolesControllerTestV21(test.NoDBTestCase):
|
|||
super(ConsolesControllerTestV21, self).setUp()
|
||||
self.flags(verbose=True)
|
||||
self.instance_db = FakeInstanceDB()
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
self.instance_db.return_server_by_id)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
self.instance_db.return_server_by_uuid)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
self.instance_db.return_server_by_id)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
self.instance_db.return_server_by_uuid)
|
||||
self.uuid = str(stdlib_uuid.uuid4())
|
||||
self.url = '/v2/fake/servers/%s/consoles' % self.uuid
|
||||
self._set_up_controller()
|
||||
|
|
|
@ -19,7 +19,6 @@ from oslo_serialization import jsonutils
|
|||
import webob
|
||||
|
||||
from nova.compute import api as compute_api
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -238,10 +237,10 @@ class CreateserverextTest(test.TestCase):
|
|||
|
||||
def test_create_instance_with_security_group_json(self):
|
||||
security_groups = ['test', 'test1']
|
||||
self.stubs.Set(db, 'security_group_get_by_name',
|
||||
return_security_group_get_by_name)
|
||||
self.stubs.Set(db, 'instance_add_security_group',
|
||||
return_instance_add_security_group)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_get_by_name)
|
||||
self.stub_out('nova.db.instance_add_security_group',
|
||||
return_instance_add_security_group)
|
||||
body_dict = self._create_security_group_request_dict(security_groups)
|
||||
request = self._get_create_request_json(body_dict)
|
||||
response = request.get_response(fakes.wsgi_app(
|
||||
|
@ -250,8 +249,9 @@ class CreateserverextTest(test.TestCase):
|
|||
self.assertJsonEqual(self.security_group, security_groups)
|
||||
|
||||
def test_get_server_by_id_verify_security_groups_json(self):
|
||||
self.stubs.Set(db, 'instance_get', fakes.fake_instance_get())
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fakes.fake_instance_get())
|
||||
self.stub_out('nova.db.instance_get', fakes.fake_instance_get())
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get())
|
||||
req = webob.Request.blank('/v2/fake/os-create-server-ext/1')
|
||||
req.headers['Content-Type'] = 'application/json'
|
||||
response = req.get_response(fakes.wsgi_app(
|
||||
|
|
|
@ -20,7 +20,6 @@ from oslo_serialization import jsonutils
|
|||
from nova.api.openstack import compute
|
||||
from nova.compute import api as compute_api
|
||||
from nova.compute import flavors
|
||||
from nova import db
|
||||
from nova import objects
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -63,7 +62,7 @@ class DiskConfigTestCaseV21(test.TestCase):
|
|||
if id_ == instance['id']:
|
||||
return instance
|
||||
|
||||
self.stubs.Set(db, 'instance_get', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get', fake_instance_get)
|
||||
|
||||
def fake_instance_get_by_uuid(context, uuid,
|
||||
columns_to_join=None, use_slave=False):
|
||||
|
@ -71,15 +70,15 @@ class DiskConfigTestCaseV21(test.TestCase):
|
|||
if uuid == instance['uuid']:
|
||||
return instance
|
||||
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
|
||||
def fake_instance_get_all(context, *args, **kwargs):
|
||||
return FAKE_INSTANCES
|
||||
|
||||
self.stubs.Set(db, 'instance_get_all', fake_instance_get_all)
|
||||
self.stubs.Set(db, 'instance_get_all_by_filters',
|
||||
fake_instance_get_all)
|
||||
self.stub_out('nova.db.instance_get_all', fake_instance_get_all)
|
||||
self.stub_out('nova.db.instance_get_all_by_filters',
|
||||
fake_instance_get_all)
|
||||
|
||||
self.stubs.Set(objects.Instance, 'save',
|
||||
lambda *args, **kwargs: None)
|
||||
|
@ -107,27 +106,26 @@ class DiskConfigTestCaseV21(test.TestCase):
|
|||
def fake_instance_get_for_create(context, id_, *args, **kwargs):
|
||||
return (inst, inst)
|
||||
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
fake_instance_get_for_create)
|
||||
|
||||
def fake_instance_get_all_for_create(context, *args, **kwargs):
|
||||
return [inst]
|
||||
self.stubs.Set(db, 'instance_get_all',
|
||||
self.stub_out('nova.db.instance_get_all',
|
||||
fake_instance_get_all_for_create)
|
||||
self.stubs.Set(db, 'instance_get_all_by_filters',
|
||||
self.stub_out('nova.db.instance_get_all_by_filters',
|
||||
fake_instance_get_all_for_create)
|
||||
|
||||
def fake_instance_add_security_group(context, instance_id,
|
||||
security_group_id):
|
||||
pass
|
||||
|
||||
self.stubs.Set(db,
|
||||
'instance_add_security_group',
|
||||
fake_instance_add_security_group)
|
||||
self.stub_out('nova.db.instance_add_security_group',
|
||||
fake_instance_add_security_group)
|
||||
|
||||
return inst
|
||||
|
||||
self.stubs.Set(db, 'instance_create', fake_instance_create)
|
||||
self.stub_out('nova.db.instance_create', fake_instance_create)
|
||||
|
||||
def _set_up_app(self):
|
||||
self.app = compute.APIRouterV21(init_only=('servers', 'images',
|
||||
|
|
|
@ -19,7 +19,6 @@ import webob
|
|||
from nova import availability_zones
|
||||
from nova import compute
|
||||
from nova.compute import vm_states
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova.objects import instance as instance_obj
|
||||
|
@ -86,7 +85,7 @@ class ExtendedAvailabilityZoneTestV21(test.TestCase):
|
|||
self.stubs.Set(availability_zones, 'get_host_availability_zone',
|
||||
fake_get_host_availability_zone)
|
||||
return_server = fakes.fake_instance_get()
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
def _make_request(self, url):
|
||||
req = webob.Request.blank(url)
|
||||
|
|
|
@ -19,7 +19,6 @@ import webob
|
|||
|
||||
from nova.api.openstack import wsgi as os_wsgi
|
||||
from nova import compute
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova import test
|
||||
|
@ -85,7 +84,7 @@ class ExtendedServerAttributesTestV21(test.TestCase):
|
|||
fakes.stub_out_nw_api(self)
|
||||
self.stubs.Set(compute.api.API, 'get', fake_compute_get)
|
||||
self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_compute_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_compute_get)
|
||||
|
||||
def _make_request(self, url):
|
||||
req = fakes.HTTPRequest.blank(url)
|
||||
|
|
|
@ -17,7 +17,6 @@ from oslo_serialization import jsonutils
|
|||
import webob
|
||||
|
||||
from nova import compute
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova.objects import instance as instance_obj
|
||||
|
@ -73,7 +72,7 @@ class ExtendedStatusTestV21(test.TestCase):
|
|||
self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all)
|
||||
self._set_flags()
|
||||
return_server = fakes.fake_instance_get()
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
def _get_server(self, body):
|
||||
return jsonutils.loads(body).get('server')
|
||||
|
|
|
@ -21,7 +21,6 @@ from nova.api.openstack.compute import (extended_volumes
|
|||
as extended_volumes_v21)
|
||||
from nova.api.openstack import wsgi as os_wsgi
|
||||
from nova import compute
|
||||
from nova import db
|
||||
from nova import objects
|
||||
from nova.objects import instance as instance_obj
|
||||
from nova import test
|
||||
|
@ -99,12 +98,12 @@ class ExtendedVolumesTestV21(test.TestCase):
|
|||
fakes.stub_out_nw_api(self)
|
||||
self.stubs.Set(compute.api.API, 'get', fake_compute_get)
|
||||
self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all)
|
||||
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance_uuids',
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance_uuids',
|
||||
fake_bdms_get_all_by_instance_uuids)
|
||||
self._setUp()
|
||||
self.app = self._setup_app()
|
||||
return_server = fakes.fake_instance_get()
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
def _setup_app(self):
|
||||
return fakes.wsgi_app_v21(init_only=('os-extended-volumes',
|
||||
|
|
|
@ -20,7 +20,6 @@ from nova.api.openstack.compute.legacy_v2.contrib import fixed_ips \
|
|||
as fixed_ips_v2
|
||||
from nova.api.openstack import wsgi as os_wsgi
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -127,9 +126,9 @@ class FixedIpTestV21(test.NoDBTestCase):
|
|||
def setUp(self):
|
||||
super(FixedIpTestV21, self).setUp()
|
||||
|
||||
self.stubs.Set(db, "fixed_ip_get_by_address",
|
||||
fake_fixed_ip_get_by_address)
|
||||
self.stubs.Set(db, "fixed_ip_update", fake_fixed_ip_update)
|
||||
self.stub_out("nova.db.fixed_ip_get_by_address",
|
||||
fake_fixed_ip_get_by_address)
|
||||
self.stub_out("nova.db.fixed_ip_update", fake_fixed_ip_update)
|
||||
|
||||
self.context = context.get_admin_context()
|
||||
self.controller = self.fixed_ips.FixedIPController()
|
||||
|
|
|
@ -26,7 +26,6 @@ from nova.api.openstack.compute.legacy_v2.contrib import flavor_access \
|
|||
as flavor_access_v2
|
||||
from nova.api.openstack.compute.legacy_v2 import flavors as flavors_api
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -139,12 +138,12 @@ class FlavorAccessTestV21(test.NoDBTestCase):
|
|||
self.req = FakeRequest()
|
||||
self.req.environ = {"nova.context": context.RequestContext('fake_user',
|
||||
'fake')}
|
||||
self.stubs.Set(db, 'flavor_get_by_flavor_id',
|
||||
fake_get_flavor_by_flavor_id)
|
||||
self.stubs.Set(db, 'flavor_get_all',
|
||||
fake_get_all_flavors_sorted_list)
|
||||
self.stubs.Set(db, 'flavor_access_get_by_flavor_id',
|
||||
fake_get_flavor_access_by_flavor_id)
|
||||
self.stub_out('nova.db.flavor_get_by_flavor_id',
|
||||
fake_get_flavor_by_flavor_id)
|
||||
self.stub_out('nova.db.flavor_get_all',
|
||||
fake_get_all_flavors_sorted_list)
|
||||
self.stub_out('nova.db.flavor_access_get_by_flavor_id',
|
||||
fake_get_flavor_access_by_flavor_id)
|
||||
|
||||
self.flavor_access_controller = self.FlavorAccessController()
|
||||
self.flavor_action_controller = self.FlavorActionController()
|
||||
|
@ -288,8 +287,8 @@ class FlavorAccessTestV21(test.NoDBTestCase):
|
|||
def stub_add_flavor_access(context, flavorid, projectid):
|
||||
self.assertEqual('3', flavorid, "flavorid")
|
||||
self.assertEqual("proj2", projectid, "projectid")
|
||||
self.stubs.Set(db, 'flavor_access_add',
|
||||
stub_add_flavor_access)
|
||||
self.stub_out('nova.db.flavor_access_add',
|
||||
stub_add_flavor_access)
|
||||
expected = {'flavor_access':
|
||||
[{'flavor_id': '3', 'tenant_id': 'proj3'}]}
|
||||
body = {'addTenantAccess': {'tenant': 'proj2'}}
|
||||
|
@ -325,8 +324,8 @@ class FlavorAccessTestV21(test.NoDBTestCase):
|
|||
def stub_add_flavor_access(context, flavorid, projectid):
|
||||
raise exception.FlavorAccessExists(flavor_id=flavorid,
|
||||
project_id=projectid)
|
||||
self.stubs.Set(db, 'flavor_access_add',
|
||||
stub_add_flavor_access)
|
||||
self.stub_out('nova.db.flavor_access_add',
|
||||
stub_add_flavor_access)
|
||||
body = {'addTenantAccess': {'tenant': 'proj2'}}
|
||||
add_access = self._get_add_access()
|
||||
self.assertRaises(exc.HTTPConflict,
|
||||
|
@ -336,8 +335,8 @@ class FlavorAccessTestV21(test.NoDBTestCase):
|
|||
def stub_remove_flavor_access(context, flavorid, projectid):
|
||||
raise exception.FlavorAccessNotFound(flavor_id=flavorid,
|
||||
project_id=projectid)
|
||||
self.stubs.Set(db, 'flavor_access_remove',
|
||||
stub_remove_flavor_access)
|
||||
self.stub_out('nova.db.flavor_access_remove',
|
||||
stub_remove_flavor_access)
|
||||
body = {'removeTenantAccess': {'tenant': 'proj2'}}
|
||||
remove_access = self._get_remove_access()
|
||||
self.assertRaises(exc.HTTPNotFound,
|
||||
|
|
|
@ -27,7 +27,6 @@ from nova.api.openstack.compute.legacy_v2.contrib import flavor_access \
|
|||
from nova.api.openstack.compute.legacy_v2.contrib import flavormanage \
|
||||
as flavormanage_v2
|
||||
from nova.compute import flavors
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -104,7 +103,7 @@ class FlavorManageTestV21(test.NoDBTestCase):
|
|||
"get_flavor_by_flavor_id",
|
||||
fake_get_flavor_by_flavor_id)
|
||||
self.stubs.Set(flavors, "destroy", fake_destroy)
|
||||
self.stubs.Set(db, "flavor_create", fake_create)
|
||||
self.stub_out("nova.db.flavor_create", fake_create)
|
||||
self.app = self._setup_app()
|
||||
|
||||
self.request_body = {
|
||||
|
|
|
@ -20,7 +20,6 @@ from nova.api.openstack.compute import flavors_extraspecs \
|
|||
as flavorextraspecs_v21
|
||||
from nova.api.openstack.compute.legacy_v2.contrib import flavorextraspecs \
|
||||
as flavorextraspecs_v2
|
||||
import nova.db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -83,8 +82,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
self.assertEqual('value1', res_dict['extra_specs']['key1'])
|
||||
|
||||
def test_index_no_data(self):
|
||||
self.stubs.Set(nova.db, 'flavor_extra_specs_get',
|
||||
return_empty_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_get',
|
||||
return_empty_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs')
|
||||
res_dict = self.controller.index(req, 1)
|
||||
|
@ -102,8 +101,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
self.assertEqual('value5', res_dict['key5'])
|
||||
|
||||
def test_show_spec_not_found(self):
|
||||
self.stubs.Set(nova.db, 'flavor_extra_specs_get',
|
||||
return_empty_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_get',
|
||||
return_empty_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key6')
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.show,
|
||||
|
@ -130,8 +129,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
def test_delete(self):
|
||||
flavor = dict(test_flavor.fake_flavor,
|
||||
extra_specs={'key5': 'value5'})
|
||||
self.stubs.Set(nova.db, 'flavor_extra_specs_delete',
|
||||
delete_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_delete',
|
||||
delete_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key5',
|
||||
use_admin_context=True)
|
||||
|
@ -140,8 +139,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
self.controller.delete(req, 1, 'key5')
|
||||
|
||||
def test_delete_no_admin(self):
|
||||
self.stubs.Set(nova.db, 'flavor_extra_specs_delete',
|
||||
delete_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_delete',
|
||||
delete_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key5')
|
||||
self.assertRaises(exception.Forbidden, self.controller.delete,
|
||||
|
@ -154,9 +153,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
req, 1, 'key6')
|
||||
|
||||
def test_create(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"extra_specs": {"key1": "value1", "key2": 0.5, "key3": 5}}
|
||||
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
|
@ -167,9 +165,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
self.assertEqual(5, res_dict['extra_specs']['key3'])
|
||||
|
||||
def test_create_no_admin(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
|
||||
req = self._get_request('1/os-extra_specs')
|
||||
|
@ -180,9 +177,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorNotFound(flavor_id='')
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.create,
|
||||
|
@ -192,18 +188,16 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorExtraSpecUpdateCreateFailed(id=1, retries=5)
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"extra_specs": {"key1": "value1"}}
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(webob.exc.HTTPConflict, self.controller.create,
|
||||
req, 1, body=body)
|
||||
|
||||
def _test_create_bad_request(self, body):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs', use_admin_context=True)
|
||||
self.assertRaises(self.bad_request, self.controller.create,
|
||||
|
@ -264,9 +258,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
self.assertEqual('value1', res_dict['extra_specs'][key])
|
||||
|
||||
def test_update_item(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
|
@ -276,9 +269,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
self.assertEqual('value1', res_dict['key1'])
|
||||
|
||||
def test_update_item_no_admin(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key1')
|
||||
|
@ -286,9 +278,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
req, 1, 'key1', body=body)
|
||||
|
||||
def _test_update_item_bad_request(self, body):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
use_admin_context=True)
|
||||
|
@ -323,9 +314,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
self._test_update_item_bad_request({"key1": value})
|
||||
|
||||
def test_update_item_body_uri_mismatch(self):
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = self._get_request('1/os-extra_specs/bad', use_admin_context=True)
|
||||
|
@ -336,9 +326,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorNotFound(flavor_id='')
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
|
@ -350,9 +339,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
def fake_instance_type_extra_specs_update_or_create(*args, **kwargs):
|
||||
raise exception.FlavorExtraSpecUpdateCreateFailed(id=1, retries=5)
|
||||
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
fake_instance_type_extra_specs_update_or_create)
|
||||
body = {"key1": "value1"}
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
|
@ -362,9 +350,8 @@ class FlavorsExtraSpecsTestV21(test.TestCase):
|
|||
|
||||
def test_update_really_long_integer_value(self):
|
||||
value = 10 ** 1000
|
||||
self.stubs.Set(nova.db,
|
||||
'flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
self.stub_out('nova.db.flavor_extra_specs_update_or_create',
|
||||
return_create_flavor_extra_specs)
|
||||
|
||||
req = self._get_request('1/os-extra_specs/key1',
|
||||
use_admin_context=True)
|
||||
|
|
|
@ -216,8 +216,8 @@ class FloatingIpTestV21(test.TestCase):
|
|||
stub_nw_info(self))
|
||||
|
||||
fake_network.stub_out_nw_api_get_instance_nw_info(self)
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fake_instance_get)
|
||||
|
||||
self.context = context.get_admin_context()
|
||||
self._create_floating_ips()
|
||||
|
@ -791,8 +791,8 @@ class ExtendedFloatingIpTestV21(test.TestCase):
|
|||
stub_nw_info(self))
|
||||
|
||||
fake_network.stub_out_nw_api_get_instance_nw_info(self)
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fake_instance_get)
|
||||
|
||||
self.context = context.get_admin_context()
|
||||
self._create_floating_ips()
|
||||
|
|
|
@ -40,10 +40,10 @@ class FpingTestV21(test.TestCase):
|
|||
self.flags(verbose=True, use_ipv6=False)
|
||||
return_server = fakes.fake_instance_get()
|
||||
return_servers = fakes.fake_instance_get_all_by_filters()
|
||||
self.stubs.Set(nova.db, "instance_get_all_by_filters",
|
||||
return_servers)
|
||||
self.stubs.Set(nova.db, "instance_get_by_uuid",
|
||||
return_server)
|
||||
self.stub_out("nova.db.instance_get_all_by_filters",
|
||||
return_servers)
|
||||
self.stub_out("nova.db.instance_get_by_uuid",
|
||||
return_server)
|
||||
self.stubs.Set(nova.utils, "execute",
|
||||
execute)
|
||||
self.stubs.Set(self.controller_cls, "check_fping",
|
||||
|
|
|
@ -19,7 +19,6 @@ import webob
|
|||
|
||||
from nova import compute
|
||||
from nova.compute import vm_states
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova.objects import instance as instance_obj
|
||||
|
@ -50,7 +49,7 @@ class HideServerAddressesTestV21(test.TestCase):
|
|||
super(HideServerAddressesTestV21, self).setUp()
|
||||
fakes.stub_out_nw_api(self)
|
||||
return_server = fakes.fake_instance_get()
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
self._setup_wsgi()
|
||||
|
||||
def _make_request(self, url):
|
||||
|
|
|
@ -139,11 +139,11 @@ class HostTestCaseV21(test.TestCase):
|
|||
|
||||
def _setup_stubs(self):
|
||||
# Pretend we have fake_hosts.HOST_LIST in the DB
|
||||
self.stubs.Set(db, 'service_get_all',
|
||||
stub_service_get_all)
|
||||
self.stub_out('nova.db.service_get_all',
|
||||
stub_service_get_all)
|
||||
# Only hosts in our fake DB exist
|
||||
self.stubs.Set(db, 'service_get_by_host_and_binary',
|
||||
stub_service_get_by_host_and_binary)
|
||||
self.stub_out('nova.db.service_get_by_host_and_binary',
|
||||
stub_service_get_by_host_and_binary)
|
||||
# 'host_c1' always succeeds, and 'host_c2'
|
||||
self.stubs.Set(self.hosts_api, 'set_host_enabled',
|
||||
stub_set_host_enabled)
|
||||
|
@ -193,8 +193,8 @@ class HostTestCaseV21(test.TestCase):
|
|||
def stub_service_get_all_notimpl(self, req):
|
||||
return [{'host': 'notimplemented', 'topic': None,
|
||||
'availability_zone': None}]
|
||||
self.stubs.Set(db, 'service_get_all',
|
||||
stub_service_get_all_notimpl)
|
||||
self.stub_out('nova.db.service_get_all',
|
||||
stub_service_get_all_notimpl)
|
||||
body = {key: val}
|
||||
self.assertRaises(webob.exc.HTTPNotImplemented,
|
||||
self.controller.update,
|
||||
|
|
|
@ -25,7 +25,6 @@ from nova.api.openstack.compute.legacy_v2.contrib import hypervisors \
|
|||
from nova.api.openstack import extensions
|
||||
from nova.cells import utils as cells_utils
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova import test
|
||||
|
@ -208,8 +207,8 @@ class HypervisorsTestV21(test.NoDBTestCase):
|
|||
fake_compute_node_search_by_hypervisor)
|
||||
self.stubs.Set(self.controller.host_api, 'compute_node_get',
|
||||
fake_compute_node_get)
|
||||
self.stubs.Set(db, 'compute_node_statistics',
|
||||
fake_compute_node_statistics)
|
||||
self.stub_out('nova.db.compute_node_statistics',
|
||||
fake_compute_node_statistics)
|
||||
|
||||
def test_view_hypervisor_nodetail_noservers(self):
|
||||
result = self.controller._view_hypervisor(
|
||||
|
|
|
@ -24,7 +24,6 @@ from nova.api.openstack.compute import instance_actions as instance_actions_v21
|
|||
from nova.api.openstack.compute.legacy_v2.contrib import instance_actions \
|
||||
as instance_actions_v2
|
||||
from nova.compute import api as compute_api
|
||||
from nova import db
|
||||
from nova.db.sqlalchemy import models
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
|
@ -96,7 +95,8 @@ class InstanceActionsPolicyTestV21(test.NoDBTestCase):
|
|||
**{'name': 'fake', 'project_id': '%s_unequal' %
|
||||
context.project_id})
|
||||
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
req = self._get_http_req('os-instance-actions')
|
||||
self.assertRaises(exception.Forbidden, self.controller.index, req,
|
||||
str(uuid.uuid4()))
|
||||
|
@ -111,7 +111,8 @@ class InstanceActionsPolicyTestV21(test.NoDBTestCase):
|
|||
**{'name': 'fake', 'project_id': '%s_unequal' %
|
||||
context.project_id})
|
||||
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
req = self._get_http_req('os-instance-actions/1')
|
||||
self.assertRaises(exception.Forbidden, self.controller.show, req,
|
||||
str(uuid.uuid4()), '1')
|
||||
|
@ -145,7 +146,8 @@ class InstanceActionsTestV21(test.NoDBTestCase):
|
|||
**{'name': 'fake', 'project_id': context.project_id})
|
||||
|
||||
self.stubs.Set(compute_api.API, 'get', fake_get)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
|
||||
def _get_http_req(self, action, use_admin_context=False):
|
||||
fake_url = '/123/servers/12/%s' % action
|
||||
|
@ -167,7 +169,7 @@ class InstanceActionsTestV21(test.NoDBTestCase):
|
|||
actions.append(action)
|
||||
return actions
|
||||
|
||||
self.stubs.Set(db, 'actions_get', fake_get_actions)
|
||||
self.stub_out('nova.db.actions_get', fake_get_actions)
|
||||
req = self._get_http_req('os-instance-actions')
|
||||
res_dict = self.controller.index(req, FAKE_UUID)
|
||||
for res in res_dict['instanceActions']:
|
||||
|
@ -188,8 +190,8 @@ class InstanceActionsTestV21(test.NoDBTestCase):
|
|||
events.append(event)
|
||||
return events
|
||||
|
||||
self.stubs.Set(db, 'action_get_by_request_id', fake_get_action)
|
||||
self.stubs.Set(db, 'action_events_get', fake_get_events)
|
||||
self.stub_out('nova.db.action_get_by_request_id', fake_get_action)
|
||||
self.stub_out('nova.db.action_events_get', fake_get_events)
|
||||
req = self._get_http_req('os-instance-actions/1',
|
||||
use_admin_context=True)
|
||||
res_dict = self.controller.show(req, FAKE_UUID, FAKE_REQUEST_ID)
|
||||
|
@ -206,8 +208,8 @@ class InstanceActionsTestV21(test.NoDBTestCase):
|
|||
def fake_get_events(context, action_id):
|
||||
return self.fake_events[action_id]
|
||||
|
||||
self.stubs.Set(db, 'action_get_by_request_id', fake_get_action)
|
||||
self.stubs.Set(db, 'action_events_get', fake_get_events)
|
||||
self.stub_out('nova.db.action_get_by_request_id', fake_get_action)
|
||||
self.stub_out('nova.db.action_events_get', fake_get_events)
|
||||
|
||||
self._set_policy_rules()
|
||||
req = self._get_http_req('os-instance-actions/1')
|
||||
|
@ -220,7 +222,7 @@ class InstanceActionsTestV21(test.NoDBTestCase):
|
|||
def fake_no_action(context, uuid, action_id):
|
||||
return None
|
||||
|
||||
self.stubs.Set(db, 'action_get_by_request_id', fake_no_action)
|
||||
self.stub_out('nova.db.action_get_by_request_id', fake_no_action)
|
||||
req = self._get_http_req('os-instance-actions/1')
|
||||
self.assertRaises(exc.HTTPNotFound, self.controller.show, req,
|
||||
FAKE_UUID, FAKE_REQUEST_ID)
|
||||
|
|
|
@ -21,7 +21,6 @@ from nova.api.openstack.compute import instance_usage_audit_log as v21_ial
|
|||
from nova.api.openstack.compute.legacy_v2.contrib \
|
||||
import instance_usage_audit_log as ial
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -126,10 +125,8 @@ class InstanceUsageAuditLogTestV21(test.NoDBTestCase):
|
|||
|
||||
self.stubs.Set(utils, 'last_completed_audit_period',
|
||||
fake_last_completed_audit_period)
|
||||
self.stubs.Set(db, 'service_get_all',
|
||||
fake_service_get_all)
|
||||
self.stubs.Set(db, 'task_log_get_all',
|
||||
fake_task_log_get_all)
|
||||
self.stub_out('nova.db.service_get_all', fake_service_get_all)
|
||||
self.stub_out('nova.db.task_log_get_all', fake_task_log_get_all)
|
||||
|
||||
self.req = fakes.HTTPRequest.blank('')
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@ from nova.api.openstack.compute.legacy_v2.contrib import keypairs \
|
|||
as keypairs_v2
|
||||
from nova.api.openstack import wsgi as os_wsgi
|
||||
from nova.compute import api as compute_api
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova import policy
|
||||
|
@ -82,12 +81,12 @@ class KeypairsTestV21(test.TestCase):
|
|||
fakes.stub_out_networking(self)
|
||||
fakes.stub_out_rate_limiting(self.stubs)
|
||||
|
||||
self.stubs.Set(db, "key_pair_get_all_by_user",
|
||||
db_key_pair_get_all_by_user)
|
||||
self.stubs.Set(db, "key_pair_create",
|
||||
db_key_pair_create)
|
||||
self.stubs.Set(db, "key_pair_destroy",
|
||||
db_key_pair_destroy)
|
||||
self.stub_out("nova.db.key_pair_get_all_by_user",
|
||||
db_key_pair_get_all_by_user)
|
||||
self.stub_out("nova.db.key_pair_create",
|
||||
db_key_pair_create)
|
||||
self.stub_out("nova.db.key_pair_destroy",
|
||||
db_key_pair_destroy)
|
||||
self.flags(
|
||||
osapi_compute_extension=[
|
||||
'nova.api.openstack.compute.contrib.select_extensions'],
|
||||
|
@ -233,7 +232,7 @@ class KeypairsTestV21(test.TestCase):
|
|||
self.assertIn('Quota exceeded, too many key pairs.', ex.explanation)
|
||||
|
||||
def test_keypair_create_duplicate(self):
|
||||
self.stubs.Set(db, "key_pair_create", db_key_pair_create_duplicate)
|
||||
self.stub_out("nova.db.key_pair_create", db_key_pair_create_duplicate)
|
||||
body = {'keypair': {'name': 'create_duplicate'}}
|
||||
ex = self.assertRaises(webob.exc.HTTPConflict,
|
||||
self.controller.create, self.req, body=body)
|
||||
|
@ -252,8 +251,8 @@ class KeypairsTestV21(test.TestCase):
|
|||
def db_key_pair_get_not_found(context, user_id, name):
|
||||
raise exception.KeypairNotFound(user_id=user_id, name=name)
|
||||
|
||||
self.stubs.Set(db, "key_pair_destroy",
|
||||
db_key_pair_get_not_found)
|
||||
self.stub_out("nova.db.key_pair_destroy",
|
||||
db_key_pair_get_not_found)
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.controller.delete, self.req, 'FAKE')
|
||||
|
||||
|
@ -264,7 +263,7 @@ class KeypairsTestV21(test.TestCase):
|
|||
name='foo', public_key='XXX', fingerprint='YYY',
|
||||
type='ssh')
|
||||
|
||||
self.stubs.Set(db, "key_pair_get", _db_key_pair_get)
|
||||
self.stub_out("nova.db.key_pair_get", _db_key_pair_get)
|
||||
|
||||
res_dict = self.controller.show(self.req, 'FAKE')
|
||||
self.assertEqual('foo', res_dict['keypair']['name'])
|
||||
|
@ -277,16 +276,16 @@ class KeypairsTestV21(test.TestCase):
|
|||
def _db_key_pair_get(context, user_id, name):
|
||||
raise exception.KeypairNotFound(user_id=user_id, name=name)
|
||||
|
||||
self.stubs.Set(db, "key_pair_get", _db_key_pair_get)
|
||||
self.stub_out("nova.db.key_pair_get", _db_key_pair_get)
|
||||
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.controller.show, self.req, 'FAKE')
|
||||
|
||||
def test_show_server(self):
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
fakes.fake_instance_get())
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fakes.fake_instance_get())
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get())
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get())
|
||||
req = webob.Request.blank(self.base_url + '/servers/1')
|
||||
req.headers['Content-Type'] = 'application/json'
|
||||
response = req.get_response(self.app_server)
|
||||
|
@ -358,12 +357,10 @@ class KeypairPolicyTestV21(test.NoDBTestCase):
|
|||
name='foo', public_key='XXX', fingerprint='YYY',
|
||||
type='ssh')
|
||||
|
||||
self.stubs.Set(db, "key_pair_get",
|
||||
_db_key_pair_get)
|
||||
self.stubs.Set(db, "key_pair_get_all_by_user",
|
||||
db_key_pair_get_all_by_user)
|
||||
self.stubs.Set(db, "key_pair_destroy",
|
||||
db_key_pair_destroy)
|
||||
self.stub_out("nova.db.key_pair_get", _db_key_pair_get)
|
||||
self.stub_out("nova.db.key_pair_get_all_by_user",
|
||||
db_key_pair_get_all_by_user)
|
||||
self.stub_out("nova.db.key_pair_destroy", db_key_pair_destroy)
|
||||
|
||||
self.req = fakes.HTTPRequest.blank('')
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@ from nova.api.openstack.compute import servers as servers_v21
|
|||
from nova.api.openstack import extensions as extensions_v20
|
||||
from nova.compute import api as compute_api
|
||||
from nova.compute import flavors
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.network import manager
|
||||
from nova import test
|
||||
|
@ -126,17 +125,15 @@ class MultiCreateExtensionTestV21(test.TestCase):
|
|||
fake.stub_out_image_service(self)
|
||||
fakes.stub_out_nw_api(self)
|
||||
self.stubs.Set(uuid, 'uuid4', fake_gen_uuid)
|
||||
self.stubs.Set(db, 'instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stubs.Set(db, 'project_get_networks',
|
||||
project_get_networks)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stubs.Set(db, 'instance_system_metadata_update',
|
||||
fake_method)
|
||||
self.stubs.Set(db, 'instance_get', instance_get)
|
||||
self.stubs.Set(db, 'instance_update', instance_update)
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
server_update)
|
||||
self.stub_out('nova.db.instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.project_get_networks', project_get_networks)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_system_metadata_update', fake_method)
|
||||
self.stub_out('nova.db.instance_get', instance_get)
|
||||
self.stub_out('nova.db.instance_update', instance_update)
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
server_update)
|
||||
self.stubs.Set(manager.VlanManager, 'allocate_fixed_ip',
|
||||
fake_method)
|
||||
self.stub_out('nova.objects.RequestSpec.create', fake_method)
|
||||
|
@ -579,8 +576,8 @@ class MultiCreateExtensionTestV2(MultiCreateExtensionTestV21):
|
|||
fakes.stub_out_key_pair_funcs(self.stubs)
|
||||
fake.stub_out_image_service(self)
|
||||
self.stubs.Set(uuid, 'uuid4', fake_gen_uuid)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stubs.Set(db, 'instance_get', instance_get)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_get', instance_get)
|
||||
|
||||
def _check_multiple_create_extension_disabled(self, **kwargs):
|
||||
self.assertEqual(kwargs['min_count'], 1)
|
||||
|
|
|
@ -147,8 +147,8 @@ class TestNeutronSecurityGroupsV21(
|
|||
device_id=test_security_groups.FAKE_UUID1)
|
||||
expected = [{'rules': [], 'tenant_id': 'fake', 'id': sg['id'],
|
||||
'name': 'test', 'description': 'test-description'}]
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
test_security_groups.return_server_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
test_security_groups.return_server_by_uuid)
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/servers/%s/os-security-groups'
|
||||
% test_security_groups.FAKE_UUID1)
|
||||
res_dict = self.server_controller.index(
|
||||
|
@ -214,8 +214,8 @@ class TestNeutronSecurityGroupsV21(
|
|||
network_id=net['network']['id'], security_groups=[sg['id']],
|
||||
device_id=test_security_groups.FAKE_UUID1)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_get',
|
||||
test_security_groups.return_server)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
test_security_groups.return_server)
|
||||
body = dict(addSecurityGroup=dict(name="test"))
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action')
|
||||
|
@ -231,8 +231,8 @@ class TestNeutronSecurityGroupsV21(
|
|||
network_id=net['network']['id'], security_groups=[sg1['id']],
|
||||
device_id=test_security_groups.FAKE_UUID1)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_get',
|
||||
test_security_groups.return_server)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
test_security_groups.return_server)
|
||||
body = dict(addSecurityGroup=dict(name="sg1"))
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action')
|
||||
|
@ -247,8 +247,8 @@ class TestNeutronSecurityGroupsV21(
|
|||
port_security_enabled=True,
|
||||
device_id=test_security_groups.FAKE_UUID1)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_get',
|
||||
test_security_groups.return_server)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
test_security_groups.return_server)
|
||||
body = dict(addSecurityGroup=dict(name="test"))
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action')
|
||||
|
@ -261,8 +261,8 @@ class TestNeutronSecurityGroupsV21(
|
|||
network_id=net['network']['id'], port_security_enabled=False,
|
||||
device_id=test_security_groups.FAKE_UUID1)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_get',
|
||||
test_security_groups.return_server)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
test_security_groups.return_server)
|
||||
body = dict(addSecurityGroup=dict(name="test"))
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action')
|
||||
|
@ -271,8 +271,8 @@ class TestNeutronSecurityGroupsV21(
|
|||
req, '1', body)
|
||||
|
||||
def test_disassociate_by_non_existing_security_group_name(self):
|
||||
self.stubs.Set(nova.db, 'instance_get',
|
||||
test_security_groups.return_server)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
test_security_groups.return_server)
|
||||
body = dict(removeSecurityGroup=dict(name='non-existing'))
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action')
|
||||
|
@ -298,8 +298,8 @@ class TestNeutronSecurityGroupsV21(
|
|||
network_id=net['network']['id'], security_groups=[sg['id']],
|
||||
device_id=test_security_groups.FAKE_UUID1)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_get',
|
||||
test_security_groups.return_server)
|
||||
self.stub_out('nova.db.instance_get',
|
||||
test_security_groups.return_server)
|
||||
body = dict(removeSecurityGroup=dict(name="test"))
|
||||
|
||||
req = fakes.HTTPRequest.blank('/v2/fake/servers/1/action')
|
||||
|
|
|
@ -18,7 +18,6 @@ from webob import exc
|
|||
from nova.api.openstack.compute import pci
|
||||
from nova.api.openstack import wsgi
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova.objects import fields
|
||||
|
@ -74,8 +73,8 @@ class PciServerControllerTestV21(test.NoDBTestCase):
|
|||
return test_pci_device.fake_db_dev
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
self.stubs.Set(db, 'pci_device_get_by_addr',
|
||||
fake_pci_device_get_by_addr)
|
||||
self.stub_out('nova.db.pci_device_get_by_addr',
|
||||
fake_pci_device_get_by_addr)
|
||||
self.pci_device = objects.PciDevice.get_by_dev_addr(ctxt, 1, 'a')
|
||||
|
||||
def test_show(self):
|
||||
|
@ -155,7 +154,8 @@ class PciControlletestV21(test.NoDBTestCase):
|
|||
def fake_pci_device_get_by_id(context, id):
|
||||
return test_pci_device.fake_db_dev
|
||||
|
||||
self.stubs.Set(db, 'pci_device_get_by_id', fake_pci_device_get_by_id)
|
||||
self.stub_out('nova.db.pci_device_get_by_id',
|
||||
fake_pci_device_get_by_id)
|
||||
req = fakes.HTTPRequest.blank('/os-pci/1', use_admin_context=True)
|
||||
result = self.controller.show(req, '1')
|
||||
dist = {'pci_device': {'address': 'a',
|
||||
|
@ -175,7 +175,8 @@ class PciControlletestV21(test.NoDBTestCase):
|
|||
def fake_pci_device_get_by_id(context, id):
|
||||
raise exception.PciDeviceNotFoundById(id=id)
|
||||
|
||||
self.stubs.Set(db, 'pci_device_get_by_id', fake_pci_device_get_by_id)
|
||||
self.stub_out('nova.db.pci_device_get_by_id',
|
||||
fake_pci_device_get_by_id)
|
||||
req = fakes.HTTPRequest.blank('/os-pci/0', use_admin_context=True)
|
||||
self.assertRaises(exc.HTTPNotFound, self.controller.show, req, '0')
|
||||
|
||||
|
@ -192,8 +193,8 @@ class PciControlletestV21(test.NoDBTestCase):
|
|||
def test_index(self):
|
||||
self.stubs.Set(self.controller.host_api, 'compute_node_get_all',
|
||||
self._fake_compute_node_get_all)
|
||||
self.stubs.Set(db, 'pci_device_get_all_by_node',
|
||||
self._fake_pci_device_get_all_by_node)
|
||||
self.stub_out('nova.db.pci_device_get_all_by_node',
|
||||
self._fake_pci_device_get_all_by_node)
|
||||
|
||||
req = fakes.HTTPRequest.blank('/os-pci', use_admin_context=True)
|
||||
result = self.controller.index(req)
|
||||
|
@ -212,8 +213,8 @@ class PciControlletestV21(test.NoDBTestCase):
|
|||
def test_detail(self):
|
||||
self.stubs.Set(self.controller.host_api, 'compute_node_get_all',
|
||||
self._fake_compute_node_get_all)
|
||||
self.stubs.Set(db, 'pci_device_get_all_by_node',
|
||||
self._fake_pci_device_get_all_by_node)
|
||||
self.stub_out('nova.db.pci_device_get_all_by_node',
|
||||
self._fake_pci_device_get_all_by_node)
|
||||
req = fakes.HTTPRequest.blank('/os-pci/detail',
|
||||
use_admin_context=True)
|
||||
result = self.controller.detail(req)
|
||||
|
|
|
@ -25,7 +25,6 @@ from nova.api.openstack.compute import servers as servers_v21
|
|||
from nova.api.openstack import extensions
|
||||
import nova.compute.api
|
||||
from nova.compute import flavors
|
||||
from nova import db
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
from nova.tests.unit import fake_instance
|
||||
|
@ -199,7 +198,7 @@ class ServersControllerCreateTestV21(test.TestCase):
|
|||
return instance
|
||||
|
||||
fake.stub_out_image_service(self)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
|
||||
def _set_up_controller(self):
|
||||
ext_info = extension_info.LoadedExtensionInfo()
|
||||
|
|
|
@ -284,10 +284,10 @@ class TestSecurityGroupDefaultRulesV21(test.TestCase):
|
|||
self.assertEqual(sgr['id'], id)
|
||||
return security_group_default_rule_db(sgr)
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_default_rule_destroy',
|
||||
security_group_default_rule_destroy)
|
||||
self.stubs.Set(nova.db, 'security_group_default_rule_get',
|
||||
return_security_group_default_rule)
|
||||
self.stub_out('nova.db.security_group_default_rule_destroy',
|
||||
security_group_default_rule_destroy)
|
||||
self.stub_out('nova.db.security_group_default_rule_get',
|
||||
return_security_group_default_rule)
|
||||
|
||||
self.controller.delete(self.req, '1')
|
||||
|
||||
|
|
|
@ -328,8 +328,8 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
def return_security_groups(context, project_id):
|
||||
return [security_group_db(sg) for sg in groups]
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_project',
|
||||
return_security_groups)
|
||||
self.stub_out('nova.db.security_group_get_by_project',
|
||||
return_security_groups)
|
||||
|
||||
res_dict = self.controller.index(self.req)
|
||||
|
||||
|
@ -394,14 +394,14 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
def return_all_security_groups(context):
|
||||
return [security_group_db(sg) for sg in all_groups]
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_get_all',
|
||||
return_all_security_groups)
|
||||
self.stub_out('nova.db.security_group_get_all',
|
||||
return_all_security_groups)
|
||||
|
||||
def return_tenant_security_groups(context, project_id):
|
||||
return [security_group_db(sg) for sg in tenant_groups]
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_project',
|
||||
return_tenant_security_groups)
|
||||
self.stub_out('nova.db.security_group_get_by_project',
|
||||
return_tenant_security_groups)
|
||||
|
||||
path = '/v2/fake/os-security-groups'
|
||||
|
||||
|
@ -429,15 +429,15 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.assertEqual(server_id, FAKE_UUID1)
|
||||
return return_server_by_uuid(context, server_id)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_instance)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_instance)
|
||||
|
||||
def return_security_groups(context, instance_uuid):
|
||||
self.assertEqual(instance_uuid, FAKE_UUID1)
|
||||
return [security_group_db(sg) for sg in groups]
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_instance',
|
||||
return_security_groups)
|
||||
self.stub_out('nova.db.security_group_get_by_instance',
|
||||
return_security_groups)
|
||||
|
||||
res_dict = self.server_controller.index(self.req, FAKE_UUID1)
|
||||
|
||||
|
@ -460,9 +460,9 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.req.environ['nova.context'], FAKE_UUID1)
|
||||
|
||||
def test_get_security_group_by_instance_non_existing(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server_nonexistent)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_get', return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.server_controller.index, self.req, '1')
|
||||
|
||||
|
@ -477,8 +477,8 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.assertEqual(sg['id'], group_id)
|
||||
return security_group_db(sg)
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_get',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.security_group_get',
|
||||
return_security_group)
|
||||
|
||||
res_dict = self.controller.show(self.req, '2')
|
||||
|
||||
|
@ -509,10 +509,10 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.assertEqual(sg_update['description'], values['description'])
|
||||
return security_group_db(sg_update)
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_update',
|
||||
return_update_security_group)
|
||||
self.stubs.Set(nova.db, 'security_group_get',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.security_group_update',
|
||||
return_update_security_group)
|
||||
self.stub_out('nova.db.security_group_get',
|
||||
return_security_group)
|
||||
|
||||
res_dict = self.controller.update(self.req, '2',
|
||||
{'security_group': sg_update})
|
||||
|
@ -527,8 +527,8 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.assertEqual(sg['id'], group_id)
|
||||
return security_group_db(sg)
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_get',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.security_group_get',
|
||||
return_security_group)
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
|
||||
self.req, '2', {'security_group': sg})
|
||||
|
@ -552,10 +552,10 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.assertEqual(sg['id'], group_id)
|
||||
return security_group_db(sg)
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_destroy',
|
||||
security_group_destroy)
|
||||
self.stubs.Set(nova.db, 'security_group_get',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.security_group_destroy',
|
||||
security_group_destroy)
|
||||
self.stub_out('nova.db.security_group_get',
|
||||
return_security_group)
|
||||
|
||||
self.controller.delete(self.req, '1')
|
||||
|
||||
|
@ -596,16 +596,16 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.assertEqual(sg['id'], group_id)
|
||||
return security_group_db(sg)
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_in_use',
|
||||
security_group_in_use)
|
||||
self.stubs.Set(nova.db, 'security_group_get',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.security_group_in_use',
|
||||
security_group_in_use)
|
||||
self.stub_out('nova.db.security_group_get',
|
||||
return_security_group)
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.delete,
|
||||
self.req, '1')
|
||||
|
||||
def test_associate_by_non_existing_security_group_name(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
self.assertEqual(return_server(None, '1'),
|
||||
nova.db.instance_get(None, '1'))
|
||||
body = dict(addSecurityGroup=dict(name='non-existing'))
|
||||
|
@ -621,29 +621,29 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'invalid', body)
|
||||
|
||||
def test_associate_without_body(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
body = dict(addSecurityGroup=None)
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest,
|
||||
self.manager._addSecurityGroup, self.req, '1', body)
|
||||
|
||||
def test_associate_no_security_group_name(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
body = dict(addSecurityGroup=dict())
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest,
|
||||
self.manager._addSecurityGroup, self.req, '1', body)
|
||||
|
||||
def test_associate_security_group_name_with_whitespaces(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
body = dict(addSecurityGroup=dict(name=" "))
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest,
|
||||
self.manager._addSecurityGroup, self.req, '1', body)
|
||||
|
||||
def test_associate_non_existing_instance(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server_nonexistent)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
self.stub_out('nova.db.instance_get', return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
body = dict(addSecurityGroup=dict(name="test"))
|
||||
|
||||
|
@ -651,20 +651,20 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.manager._addSecurityGroup, self.req, '1', body)
|
||||
|
||||
def test_associate_non_running_instance(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_non_running_server)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_non_running_server)
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
self.stub_out('nova.db.instance_get', return_non_running_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_non_running_server)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_without_instances)
|
||||
body = dict(addSecurityGroup=dict(name="test"))
|
||||
|
||||
self.manager._addSecurityGroup(self.req, '1', body)
|
||||
|
||||
def test_associate_already_associated_security_group_to_instance(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
body = dict(addSecurityGroup=dict(name="test"))
|
||||
|
||||
|
@ -673,14 +673,14 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'1', body)
|
||||
|
||||
def test_associate(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.mox.StubOutWithMock(nova.db, 'instance_add_security_group')
|
||||
nova.db.instance_add_security_group(mox.IgnoreArg(),
|
||||
mox.IgnoreArg(),
|
||||
mox.IgnoreArg())
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_without_instances)
|
||||
self.mox.ReplayAll()
|
||||
|
||||
|
@ -689,7 +689,7 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.manager._addSecurityGroup(self.req, '1', body)
|
||||
|
||||
def test_disassociate_by_non_existing_security_group_name(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
self.assertEqual(return_server(None, '1'),
|
||||
nova.db.instance_get(None, '1'))
|
||||
body = dict(removeSecurityGroup=dict(name='non-existing'))
|
||||
|
@ -699,8 +699,8 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'1', body)
|
||||
|
||||
def test_disassociate_by_invalid_server_id(self):
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
body = dict(removeSecurityGroup=dict(name='test'))
|
||||
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
|
@ -708,7 +708,7 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'invalid', body)
|
||||
|
||||
def test_disassociate_without_body(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
body = dict(removeSecurityGroup=None)
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest,
|
||||
|
@ -716,7 +716,7 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'1', body)
|
||||
|
||||
def test_disassociate_no_security_group_name(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
body = dict(removeSecurityGroup=dict())
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest,
|
||||
|
@ -724,7 +724,7 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'1', body)
|
||||
|
||||
def test_disassociate_security_group_name_with_whitespaces(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
body = dict(removeSecurityGroup=dict(name=" "))
|
||||
|
||||
self.assertRaises(webob.exc.HTTPBadRequest,
|
||||
|
@ -732,9 +732,9 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'1', body)
|
||||
|
||||
def test_disassociate_non_existing_instance(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server_nonexistent)
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
self.stub_out('nova.db.instance_get', return_server_nonexistent)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
body = dict(removeSecurityGroup=dict(name="test"))
|
||||
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
|
@ -742,20 +742,20 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
self.req, '1', body)
|
||||
|
||||
def test_disassociate_non_running_instance(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_non_running_server)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_non_running_server)
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
self.stub_out('nova.db.instance_get', return_non_running_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_non_running_server)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
body = dict(removeSecurityGroup=dict(name="test"))
|
||||
|
||||
self.manager._removeSecurityGroup(self.req, '1', body)
|
||||
|
||||
def test_disassociate_already_associated_security_group_to_instance(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_without_instances)
|
||||
body = dict(removeSecurityGroup=dict(name="test"))
|
||||
|
||||
|
@ -764,15 +764,15 @@ class TestSecurityGroupsV21(test.TestCase):
|
|||
'1', body)
|
||||
|
||||
def test_disassociate(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.mox.StubOutWithMock(nova.db, 'instance_remove_security_group')
|
||||
nova.db.instance_remove_security_group(mox.IgnoreArg(),
|
||||
mox.IgnoreArg(),
|
||||
mox.IgnoreArg())
|
||||
self.stubs.Set(nova.db, 'security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
self.stub_out('nova.db.security_group_get_by_name',
|
||||
return_security_group_by_name)
|
||||
self.mox.ReplayAll()
|
||||
|
||||
body = dict(removeSecurityGroup=dict(name="test"))
|
||||
|
@ -817,8 +817,8 @@ class TestSecurityGroupRulesV21(test.TestCase):
|
|||
return db2
|
||||
raise exception.SecurityGroupNotFound(security_group_id=group_id)
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_get',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.security_group_get',
|
||||
return_security_group)
|
||||
|
||||
self.parent_security_group = db2
|
||||
self.req = fakes.HTTPRequest.blank('')
|
||||
|
@ -1182,10 +1182,10 @@ class TestSecurityGroupRulesV21(test.TestCase):
|
|||
def security_group_rule_destroy(context, id):
|
||||
pass
|
||||
|
||||
self.stubs.Set(nova.db, 'security_group_rule_get',
|
||||
security_group_rule_get)
|
||||
self.stubs.Set(nova.db, 'security_group_rule_destroy',
|
||||
security_group_rule_destroy)
|
||||
self.stub_out('nova.db.security_group_rule_get',
|
||||
security_group_rule_get)
|
||||
self.stub_out('nova.db.security_group_rule_destroy',
|
||||
security_group_rule_destroy)
|
||||
|
||||
self.controller.delete(self.req, self.sg2['id'])
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ from nova.api.openstack.compute import servers as servers_v21
|
|||
from nova.compute import api as compute_api
|
||||
from nova.compute import task_states
|
||||
from nova.compute import vm_states
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.image import glance
|
||||
from nova import objects
|
||||
|
@ -86,11 +85,11 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
super(ServerActionsControllerTestV21, self).setUp()
|
||||
|
||||
CONF.set_override('host', 'localhost', group='glance')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
host='fake_host'))
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
instance_update_and_get_original)
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
instance_update_and_get_original)
|
||||
|
||||
fakes.stub_out_nw_api(self)
|
||||
fakes.stub_out_compute_api_snapshot(self.stubs)
|
||||
|
@ -220,8 +219,8 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
self.req, FAKE_UUID, body=body)
|
||||
|
||||
def test_reboot_not_found(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
return_server_not_found)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_not_found)
|
||||
|
||||
body = dict(reboot=dict(type="HARD"))
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
|
@ -244,8 +243,8 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
|
||||
def test_reboot_soft_with_soft_in_progress_raises_conflict(self):
|
||||
body = dict(reboot=dict(type="SOFT"))
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
task_state=task_states.REBOOTING))
|
||||
self.assertRaises(webob.exc.HTTPConflict,
|
||||
self.controller._action_reboot,
|
||||
|
@ -253,22 +252,22 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
|
||||
def test_reboot_hard_with_soft_in_progress_does_not_raise(self):
|
||||
body = dict(reboot=dict(type="HARD"))
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
task_state=task_states.REBOOTING))
|
||||
self.controller._action_reboot(self.req, FAKE_UUID, body=body)
|
||||
|
||||
def test_reboot_hard_with_hard_in_progress(self):
|
||||
body = dict(reboot=dict(type="HARD"))
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
task_state=task_states.REBOOTING_HARD))
|
||||
self.controller._action_reboot(self.req, FAKE_UUID, body=body)
|
||||
|
||||
def test_reboot_soft_with_hard_in_progress_raises_conflict(self):
|
||||
body = dict(reboot=dict(type="SOFT"))
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
|
||||
task_state=task_states.REBOOTING_HARD))
|
||||
self.assertRaises(webob.exc.HTTPConflict,
|
||||
self.controller._action_reboot,
|
||||
|
@ -279,7 +278,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
return_server = fakes.fake_instance_get(image_ref='2',
|
||||
vm_state=vm_states.ACTIVE,
|
||||
host='fake_host')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
body = {
|
||||
"rebuild": {
|
||||
|
@ -309,7 +308,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
def test_rebuild_accepted_minimum(self):
|
||||
return_server = fakes.fake_instance_get(image_ref='2',
|
||||
vm_state=vm_states.ACTIVE, host='fake_host')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
self_href = 'http://localhost/v2/servers/%s' % FAKE_UUID
|
||||
|
||||
body = {
|
||||
|
@ -333,7 +332,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
def rebuild(self2, context, instance, image_href, *args, **kwargs):
|
||||
info['image_href_in_call'] = image_href
|
||||
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
|
||||
self.stubs.Set(compute_api.API, 'rebuild', rebuild)
|
||||
|
||||
|
@ -353,7 +352,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
def rebuild(self2, context, instance, image_href, *args, **kwargs):
|
||||
info['image_href_in_call'] = image_href
|
||||
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
|
||||
self.stubs.Set(compute_api.API, 'rebuild', rebuild)
|
||||
|
||||
|
@ -374,7 +373,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
|
||||
return_server = fakes.fake_instance_get(image_ref='2',
|
||||
vm_state=vm_states.ACTIVE, host='fake_host')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
self_href = 'http://localhost/v2/servers/%s' % FAKE_UUID
|
||||
|
||||
body = {
|
||||
|
@ -414,7 +413,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
|
||||
return_server = fakes.fake_instance_get(metadata=metadata,
|
||||
vm_state=vm_states.ACTIVE, host='fake_host')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
body = {
|
||||
"rebuild": {
|
||||
|
@ -468,7 +467,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
def test_rebuild_admin_pass(self):
|
||||
return_server = fakes.fake_instance_get(image_ref='2',
|
||||
vm_state=vm_states.ACTIVE, host='fake_host')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
body = {
|
||||
"rebuild": {
|
||||
|
@ -490,7 +489,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
|
||||
return_server = fakes.fake_instance_get(image_ref='2',
|
||||
vm_state=vm_states.ACTIVE, host='fake_host')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
body = {
|
||||
"rebuild": {
|
||||
|
@ -509,7 +508,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
def server_not_found(self, instance_id,
|
||||
columns_to_join=None, use_slave=False):
|
||||
raise exception.InstanceNotFound(instance_id=instance_id)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', server_not_found)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', server_not_found)
|
||||
|
||||
body = {
|
||||
"rebuild": {
|
||||
|
@ -963,8 +962,8 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
'delete_on_termination': False,
|
||||
'no_device': None})]
|
||||
|
||||
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
|
||||
fake_block_device_mapping_get_all_by_instance)
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance',
|
||||
fake_block_device_mapping_get_all_by_instance)
|
||||
|
||||
system_metadata = dict(image_kernel_id=_fake_id('b'),
|
||||
image_ramdisk_id=_fake_id('c'),
|
||||
|
@ -975,7 +974,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
vm_state=vm_states.ACTIVE,
|
||||
root_device_name='/dev/vda',
|
||||
system_metadata=system_metadata)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', instance)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', instance)
|
||||
|
||||
self.mox.StubOutWithMock(self.controller.compute_api.compute_rpcapi,
|
||||
'quiesce_instance')
|
||||
|
@ -1055,8 +1054,8 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
'delete_on_termination': False,
|
||||
'no_device': None})]
|
||||
|
||||
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
|
||||
fake_block_device_mapping_get_all_by_instance)
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance',
|
||||
fake_block_device_mapping_get_all_by_instance)
|
||||
|
||||
instance = fakes.fake_instance_get(
|
||||
image_ref='',
|
||||
|
@ -1064,7 +1063,7 @@ class ServerActionsControllerTestV21(test.TestCase):
|
|||
root_device_name='/dev/vda',
|
||||
system_metadata={'image_test_key1': 'test_value1',
|
||||
'image_test_key2': 'test_value2'})
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', instance)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', instance)
|
||||
|
||||
self.mox.StubOutWithMock(self.controller.compute_api.compute_rpcapi,
|
||||
'quiesce_instance')
|
||||
|
@ -1297,7 +1296,7 @@ class ServerActionsControllerTestV2(ServerActionsControllerTestV21):
|
|||
return_server = fakes.fake_instance_get(image_ref='2',
|
||||
vm_state=vm_states.ACTIVE,
|
||||
host='fake_host')
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
body = {
|
||||
"rebuild": {
|
||||
|
|
|
@ -21,7 +21,6 @@ from nova.api.openstack.compute.legacy_v2.contrib import server_groups
|
|||
from nova.api.openstack.compute import server_groups as sg_v21
|
||||
from nova.api.openstack import extensions
|
||||
from nova import context
|
||||
import nova.db
|
||||
from nova import quota
|
||||
from nova import test
|
||||
from nova.tests.unit.api.openstack import fakes
|
||||
|
@ -146,10 +145,10 @@ class ServerGroupQuotasTestV21(test.TestCase):
|
|||
self.assertEqual(sg['id'], group_id)
|
||||
return server_group_db(sg)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_group_delete',
|
||||
server_group_delete)
|
||||
self.stubs.Set(nova.db, 'instance_group_get',
|
||||
return_server_group)
|
||||
self.stub_out('nova.db.instance_group_delete',
|
||||
server_group_delete)
|
||||
self.stub_out('nova.db.instance_group_get',
|
||||
return_server_group)
|
||||
|
||||
resp = self.controller.delete(self.req, '123')
|
||||
self.assertTrue(self.called)
|
||||
|
|
|
@ -395,10 +395,10 @@ class ServerGroupTestV21(test.TestCase):
|
|||
self.assertEqual(sg['id'], group_id)
|
||||
return server_group_db(sg)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_group_delete',
|
||||
server_group_delete)
|
||||
self.stubs.Set(nova.db, 'instance_group_get',
|
||||
return_server_group)
|
||||
self.stub_out('nova.db.instance_group_delete',
|
||||
server_group_delete)
|
||||
self.stub_out('nova.db.instance_group_get',
|
||||
return_server_group)
|
||||
|
||||
resp = self.controller.delete(self.req, '123')
|
||||
self.assertTrue(self.called)
|
||||
|
|
|
@ -121,12 +121,12 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
def setUp(self):
|
||||
super(ServerMetaDataTestV21, self).setUp()
|
||||
fakes.stub_out_key_pair_funcs(self.stubs)
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
self.stub_out('nova.db.instance_get', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_by_uuid)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
return_server_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_server_metadata)
|
||||
|
||||
self.stubs.Set(compute_rpcapi.ComputeAPI, 'change_instance_metadata',
|
||||
fake_change_instance_metadata)
|
||||
|
@ -154,14 +154,14 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.assertEqual(expected, res_dict)
|
||||
|
||||
def test_index_nonexistent_server(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_server_nonexistent)
|
||||
req = self._get_request()
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.controller.index, req, self.url)
|
||||
|
||||
def test_index_no_data(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_empty_server_metadata)
|
||||
req = self._get_request()
|
||||
res_dict = self.controller.index(req, self.uuid)
|
||||
|
@ -175,24 +175,24 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.assertEqual(expected, res_dict)
|
||||
|
||||
def test_show_nonexistent_server(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_server_nonexistent)
|
||||
req = self._get_request('/key2')
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.controller.show, req, self.uuid, 'key2')
|
||||
|
||||
def test_show_meta_not_found(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
return_empty_server_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_empty_server_metadata)
|
||||
req = self._get_request('/key6')
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.controller.show, req, self.uuid, 'key6')
|
||||
|
||||
def test_delete(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
return_server_metadata)
|
||||
self.stubs.Set(nova.db, 'instance_metadata_delete',
|
||||
delete_server_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_server_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_delete',
|
||||
delete_server_metadata)
|
||||
req = self._get_request('/key2')
|
||||
req.method = 'DELETE'
|
||||
res = self.controller.delete(req, self.uuid, 'key2')
|
||||
|
@ -200,16 +200,16 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.assertIsNone(res)
|
||||
|
||||
def test_delete_nonexistent_server(self):
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'DELETE'
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.controller.delete, req, self.uuid, 'key1')
|
||||
|
||||
def test_delete_meta_not_found(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
return_empty_server_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_empty_server_metadata)
|
||||
req = self._get_request('/key6')
|
||||
req.method = 'DELETE'
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
|
@ -232,8 +232,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.assertEqual(body, res_dict)
|
||||
|
||||
def test_create_empty_body(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request()
|
||||
req.method = 'POST'
|
||||
req.headers["content-type"] = "application/json"
|
||||
|
@ -242,8 +242,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.create, req, self.uuid, body=None)
|
||||
|
||||
def test_create_item_empty_key(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"metadata": {"": "value1"}}
|
||||
|
@ -254,8 +254,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.create, req, self.uuid, body=body)
|
||||
|
||||
def test_create_item_non_dict(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"metadata": None}
|
||||
|
@ -266,8 +266,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.create, req, self.uuid, body=body)
|
||||
|
||||
def test_create_item_key_too_long(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"metadata": {("a" * 260): "value1"}}
|
||||
|
@ -279,8 +279,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
req, self.uuid, body=body)
|
||||
|
||||
def test_create_malformed_container(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = fakes.HTTPRequest.blank(self.url + '/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": {}}
|
||||
|
@ -291,8 +291,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.create, req, self.uuid, body=body)
|
||||
|
||||
def test_create_malformed_data(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = fakes.HTTPRequest.blank(self.url + '/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"metadata": ['asdf']}
|
||||
|
@ -303,8 +303,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.create, req, self.uuid, body=body)
|
||||
|
||||
def test_create_nonexistent_server(self):
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
req = self._get_request()
|
||||
req.method = 'POST'
|
||||
body = {"metadata": {"key1": "value1"}}
|
||||
|
@ -357,8 +357,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.assertEqual(expected, res_dict)
|
||||
|
||||
def test_update_all_empty_body_item(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = fakes.HTTPRequest.blank(self.url + '/key1')
|
||||
req.method = 'PUT'
|
||||
req.headers["content-type"] = "application/json"
|
||||
|
@ -368,8 +368,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=None)
|
||||
|
||||
def test_update_all_with_non_dict_item(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = fakes.HTTPRequest.blank(self.url + '/bad')
|
||||
req.method = 'PUT'
|
||||
body = {"metadata": None}
|
||||
|
@ -381,8 +381,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=body)
|
||||
|
||||
def test_update_all_malformed_container(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request()
|
||||
req.method = 'PUT'
|
||||
req.content_type = "application/json"
|
||||
|
@ -394,8 +394,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=expected)
|
||||
|
||||
def test_update_all_malformed_data(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request()
|
||||
req.method = 'PUT'
|
||||
req.content_type = "application/json"
|
||||
|
@ -407,7 +407,7 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=expected)
|
||||
|
||||
def test_update_all_nonexistent_server(self):
|
||||
self.stubs.Set(nova.db, 'instance_get', return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_get', return_server_nonexistent)
|
||||
req = self._get_request()
|
||||
req.method = 'PUT'
|
||||
req.content_type = "application/json"
|
||||
|
@ -418,8 +418,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.update_all, req, '100', body=body)
|
||||
|
||||
def test_update_all_non_dict(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request()
|
||||
req.method = 'PUT'
|
||||
body = {"metadata": None}
|
||||
|
@ -441,8 +441,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.assertEqual(expected, res_dict)
|
||||
|
||||
def test_update_item_nonexistent_server(self):
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
return_server_nonexistent)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": {"key1": "value1"}}
|
||||
|
@ -454,8 +454,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=body)
|
||||
|
||||
def test_update_item_empty_body(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
req.headers["content-type"] = "application/json"
|
||||
|
@ -465,8 +465,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=None)
|
||||
|
||||
def test_update_malformed_container(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = fakes.HTTPRequest.blank(self.url)
|
||||
req.method = 'PUT'
|
||||
expected = {'meta': {}}
|
||||
|
@ -478,8 +478,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=expected)
|
||||
|
||||
def test_update_malformed_data(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = fakes.HTTPRequest.blank(self.url)
|
||||
req.method = 'PUT'
|
||||
expected = {'metadata': ['asdf']}
|
||||
|
@ -491,8 +491,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=expected)
|
||||
|
||||
def test_update_item_empty_key(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": {"": "value1"}}
|
||||
|
@ -504,8 +504,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=body)
|
||||
|
||||
def test_update_item_key_too_long(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": {("a" * 260): "value1"}}
|
||||
|
@ -517,8 +517,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
req, self.uuid, ("a" * 260), body=body)
|
||||
|
||||
def test_update_item_value_too_long(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": {"key1": ("a" * 260)}}
|
||||
|
@ -530,8 +530,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
req, self.uuid, "key1", body=body)
|
||||
|
||||
def test_update_item_too_many_keys(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/key1')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": {"key1": "value1", "key2": "value2"}}
|
||||
|
@ -543,8 +543,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=body)
|
||||
|
||||
def test_update_item_body_uri_mismatch(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/bad')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": {"key1": "value1"}}
|
||||
|
@ -556,8 +556,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=body)
|
||||
|
||||
def test_update_item_non_dict(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request('/bad')
|
||||
req.method = 'PUT'
|
||||
body = {"meta": None}
|
||||
|
@ -569,8 +569,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=body)
|
||||
|
||||
def test_update_empty_container(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = fakes.HTTPRequest.blank(self.url)
|
||||
req.method = 'PUT'
|
||||
expected = {'metadata': {}}
|
||||
|
@ -582,8 +582,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
body=expected)
|
||||
|
||||
def test_too_many_metadata_items_on_create(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
data = {"metadata": {}}
|
||||
for num in range(CONF.quota_metadata_items + 1):
|
||||
data['metadata']['key%i' % num] = "blah"
|
||||
|
@ -596,8 +596,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.create, req, self.uuid, body=data)
|
||||
|
||||
def test_invalid_metadata_items_on_create(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request()
|
||||
req.method = 'POST'
|
||||
req.headers["content-type"] = "application/json"
|
||||
|
@ -621,8 +621,8 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
self.controller.create, req, self.uuid, body=data)
|
||||
|
||||
def test_too_many_metadata_items_on_update_item(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
data = {"metadata": {}}
|
||||
for num in range(CONF.quota_metadata_items + 1):
|
||||
data['metadata']['key%i' % num] = "blah"
|
||||
|
@ -635,10 +635,10 @@ class ServerMetaDataTestV21(test.TestCase):
|
|||
req, self.uuid, body=data)
|
||||
|
||||
def test_invalid_metadata_items_on_update_item(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
data = {"metadata": {}}
|
||||
for num in range(CONF.quota_metadata_items + 1):
|
||||
data['metadata']['key%i' % num] = "blah"
|
||||
|
@ -687,15 +687,15 @@ class BadStateServerMetaDataTestV21(test.TestCase):
|
|||
def setUp(self):
|
||||
super(BadStateServerMetaDataTestV21, self).setUp()
|
||||
fakes.stub_out_key_pair_funcs(self.stubs)
|
||||
self.stubs.Set(nova.db, 'instance_metadata_get',
|
||||
return_server_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_get',
|
||||
return_server_metadata)
|
||||
self.stubs.Set(compute_rpcapi.ComputeAPI, 'change_instance_metadata',
|
||||
fake_change_instance_metadata)
|
||||
self.stubs.Set(nova.db, 'instance_get', self._return_server_in_build)
|
||||
self.stubs.Set(nova.db, 'instance_get_by_uuid',
|
||||
self._return_server_in_build_by_uuid)
|
||||
self.stubs.Set(nova.db, 'instance_metadata_delete',
|
||||
delete_server_metadata)
|
||||
self.stub_out('nova.db.instance_get', self._return_server_in_build)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
self._return_server_in_build_by_uuid)
|
||||
self.stub_out('nova.db.instance_metadata_delete',
|
||||
delete_server_metadata)
|
||||
self._set_up_resources()
|
||||
|
||||
def _set_up_resources(self):
|
||||
|
@ -713,8 +713,8 @@ class BadStateServerMetaDataTestV21(test.TestCase):
|
|||
req, self.uuid, 'key2')
|
||||
|
||||
def test_invalid_state_on_update_metadata(self):
|
||||
self.stubs.Set(nova.db, 'instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
self.stub_out('nova.db.instance_metadata_update',
|
||||
return_create_instance_metadata)
|
||||
req = self._get_request()
|
||||
req.method = 'POST'
|
||||
req.content_type = 'application/json'
|
||||
|
|
|
@ -24,7 +24,6 @@ from nova.api.openstack.compute.legacy_v2.contrib import server_start_stop \
|
|||
from nova.api.openstack.compute import servers \
|
||||
as server_v21
|
||||
from nova.compute import api as compute_api
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import policy
|
||||
from nova import test
|
||||
|
@ -70,7 +69,7 @@ class ServerStartStopTestV21(test.TestCase):
|
|||
extension_info=ext_info)
|
||||
|
||||
def test_start(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.mox.StubOutWithMock(compute_api.API, 'start')
|
||||
compute_api.API.start(mox.IgnoreArg(), mox.IgnoreArg())
|
||||
self.mox.ReplayAll()
|
||||
|
@ -83,7 +82,7 @@ class ServerStartStopTestV21(test.TestCase):
|
|||
self.start_policy: "project_id:non_fake"
|
||||
}
|
||||
policy.set_rules(oslo_policy.Rules.from_dict(rules))
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
body = dict(start="")
|
||||
exc = self.assertRaises(exception.PolicyNotAuthorized,
|
||||
self.controller._start_server,
|
||||
|
@ -91,21 +90,21 @@ class ServerStartStopTestV21(test.TestCase):
|
|||
self.assertIn(self.start_policy, exc.format_message())
|
||||
|
||||
def test_start_not_ready(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.stubs.Set(compute_api.API, 'start', fake_start_stop_not_ready)
|
||||
body = dict(start="")
|
||||
self.assertRaises(webob.exc.HTTPConflict,
|
||||
self.controller._start_server, self.req, 'test_inst', body)
|
||||
|
||||
def test_start_locked_server(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.stubs.Set(compute_api.API, 'start', fake_start_stop_locked_server)
|
||||
body = dict(start="")
|
||||
self.assertRaises(webob.exc.HTTPConflict,
|
||||
self.controller._start_server, self.req, 'test_inst', body)
|
||||
|
||||
def test_start_invalid_state(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.stubs.Set(compute_api.API, 'start', fake_start_stop_invalid_state)
|
||||
body = dict(start="")
|
||||
ex = self.assertRaises(webob.exc.HTTPConflict,
|
||||
|
@ -113,7 +112,7 @@ class ServerStartStopTestV21(test.TestCase):
|
|||
self.assertIn('is locked', six.text_type(ex))
|
||||
|
||||
def test_stop(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.mox.StubOutWithMock(compute_api.API, 'stop')
|
||||
compute_api.API.stop(mox.IgnoreArg(), mox.IgnoreArg())
|
||||
self.mox.ReplayAll()
|
||||
|
@ -126,7 +125,7 @@ class ServerStartStopTestV21(test.TestCase):
|
|||
self.stop_policy: "project_id:non_fake"
|
||||
}
|
||||
policy.set_rules(oslo_policy.Rules.from_dict(rules))
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
body = dict(stop="")
|
||||
exc = self.assertRaises(exception.PolicyNotAuthorized,
|
||||
self.controller._stop_server,
|
||||
|
@ -134,14 +133,14 @@ class ServerStartStopTestV21(test.TestCase):
|
|||
self.assertIn(self.stop_policy, exc.format_message())
|
||||
|
||||
def test_stop_not_ready(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.stubs.Set(compute_api.API, 'stop', fake_start_stop_not_ready)
|
||||
body = dict(stop="")
|
||||
self.assertRaises(webob.exc.HTTPConflict,
|
||||
self.controller._stop_server, self.req, 'test_inst', body)
|
||||
|
||||
def test_stop_locked_server(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.stubs.Set(compute_api.API, 'stop', fake_start_stop_locked_server)
|
||||
body = dict(stop="")
|
||||
ex = self.assertRaises(webob.exc.HTTPConflict,
|
||||
|
@ -149,7 +148,7 @@ class ServerStartStopTestV21(test.TestCase):
|
|||
self.assertIn('is locked', six.text_type(ex))
|
||||
|
||||
def test_stop_invalid_state(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', fake_instance_get)
|
||||
self.stubs.Set(compute_api.API, 'stop', fake_start_stop_invalid_state)
|
||||
body = dict(start="")
|
||||
self.assertRaises(webob.exc.HTTPConflict,
|
||||
|
|
|
@ -20,7 +20,6 @@ from oslo_utils import fixture as utils_fixture
|
|||
from oslo_utils import timeutils
|
||||
|
||||
from nova import compute
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova.objects import instance as instance_obj
|
||||
|
@ -71,7 +70,7 @@ class ServerUsageTestV21(test.TestCase):
|
|||
'nova.api.openstack.compute.contrib.select_extensions'],
|
||||
osapi_compute_ext_list=['Server_usage'])
|
||||
return_server = fakes.fake_instance_get()
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', return_server)
|
||||
self.stub_out('nova.db.instance_get_by_uuid', return_server)
|
||||
|
||||
def _make_request(self, url):
|
||||
req = fakes.HTTPRequest.blank(url)
|
||||
|
|
|
@ -211,8 +211,8 @@ class ControllerTest(test.TestCase):
|
|||
lambda api, *a, **k: return_servers(*a, **k))
|
||||
self.stubs.Set(compute_api.API, 'get',
|
||||
lambda api, *a, **k: return_server(*a, **k))
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
instance_update_and_get_original)
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
instance_update_and_get_original)
|
||||
|
||||
ext_info = extension_info.LoadedExtensionInfo()
|
||||
self.controller = servers.ServersController(extension_info=ext_info)
|
||||
|
@ -1557,7 +1557,7 @@ class ServersControllerDeleteTest(ControllerTest):
|
|||
self.server_delete_called = True
|
||||
deleted_at = timeutils.utcnow()
|
||||
return fake_instance.fake_db_instance(deleted_at=deleted_at)
|
||||
self.stubs.Set(db, 'instance_destroy', instance_destroy_mock)
|
||||
self.stub_out('nova.db.instance_destroy', instance_destroy_mock)
|
||||
|
||||
self.controller.delete(req, FAKE_UUID)
|
||||
# delete() should be called for instance which has never been active,
|
||||
|
@ -1862,16 +1862,16 @@ class ServersControllerRebuildInstanceTest(ControllerTest):
|
|||
self.controller._stop_server, req, FAKE_UUID, body)
|
||||
|
||||
def test_start_with_bogus_id(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid_not_found)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid_not_found)
|
||||
req = fakes.HTTPRequestV21.blank('/fake/servers/test_inst/action')
|
||||
body = dict(start="")
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
self.controller._start_server, req, 'test_inst', body)
|
||||
|
||||
def test_stop_with_bogus_id(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid_not_found)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid_not_found)
|
||||
req = fakes.HTTPRequestV21.blank('/fake/servers/test_inst/action')
|
||||
body = dict(stop="")
|
||||
self.assertRaises(webob.exc.HTTPNotFound,
|
||||
|
@ -1965,7 +1965,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
req, FAKE_UUID, body=body)
|
||||
|
||||
def test_update_server_name_all_blank_spaces(self):
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get(name='server_test'))
|
||||
req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
|
||||
req.method = 'PUT'
|
||||
|
@ -1976,7 +1976,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
req, FAKE_UUID, body=body)
|
||||
|
||||
def test_update_server_name_with_spaces_in_the_middle(self):
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get(name='server_test'))
|
||||
req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
|
||||
req.method = 'PUT'
|
||||
|
@ -1986,7 +1986,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
self.controller.update(req, FAKE_UUID, body=body)
|
||||
|
||||
def test_update_server_name_with_leading_trailing_spaces(self):
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get(name='server_test'))
|
||||
req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
|
||||
req.method = 'PUT'
|
||||
|
@ -1997,7 +1997,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
self.controller.update, req, FAKE_UUID, body=body)
|
||||
|
||||
def test_update_server_name_with_leading_trailing_spaces_compat_mode(self):
|
||||
self.stubs.Set(db, 'instance_get',
|
||||
self.stub_out('nova.db.instance_get',
|
||||
fakes.fake_instance_get(name='server_test'))
|
||||
req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
|
||||
req.method = 'PUT'
|
||||
|
@ -2043,7 +2043,7 @@ class ServersControllerUpdateTest(ControllerTest):
|
|||
def fake_update(*args, **kwargs):
|
||||
raise exception.InstanceNotFound(instance_id='fake')
|
||||
|
||||
self.stubs.Set(db, 'instance_update_and_get_original', fake_update)
|
||||
self.stub_out('nova.db.instance_update_and_get_original', fake_update)
|
||||
body = {'server': {'name': 'server_test'}}
|
||||
req = self._get_request(body)
|
||||
self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
|
||||
|
@ -2215,7 +2215,7 @@ class ServerStatusTest(test.TestCase):
|
|||
self.controller = servers.ServersController(extension_info=ext_info)
|
||||
|
||||
def _get_with_state(self, vm_state, task_state=None):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fakes.fake_instance_get(vm_state=vm_state,
|
||||
task_state=task_state))
|
||||
|
||||
|
@ -2381,14 +2381,12 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
fakes.stub_out_key_pair_funcs(self.stubs)
|
||||
fake.stub_out_image_service(self)
|
||||
self.stubs.Set(uuid, 'uuid4', fake_gen_uuid)
|
||||
self.stubs.Set(db, 'project_get_networks',
|
||||
project_get_networks)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stubs.Set(db, 'instance_system_metadata_update',
|
||||
fake_method)
|
||||
self.stubs.Set(db, 'instance_get', instance_get)
|
||||
self.stubs.Set(db, 'instance_update', instance_update)
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
self.stub_out('nova.db.project_get_networks', project_get_networks)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_system_metadata_update', fake_method)
|
||||
self.stub_out('nova.db.instance_get', instance_get)
|
||||
self.stub_out('nova.db.instance_update', instance_update)
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
server_update_and_get_original)
|
||||
self.stubs.Set(manager.VlanManager, 'allocate_fixed_ip',
|
||||
fake_method)
|
||||
|
@ -2575,7 +2573,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
# self.assertEqual(kwargs['key_name'], key_name)
|
||||
# return old_create(*args, **kwargs)
|
||||
#
|
||||
# self.stubs.Set(db, 'key_pair_get', key_pair_get)
|
||||
# self.stub_out('nova.db.key_pair_get', key_pair_get)
|
||||
# self.stubs.Set(compute_api.API, 'create', create)
|
||||
# self._test_create_extra(params)
|
||||
#
|
||||
|
@ -3089,7 +3087,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
|
||||
self.stubs.Set(fakes.QUOTAS, 'count', fake_count)
|
||||
self.stubs.Set(fakes.QUOTAS, 'limit_check', fake_limit_check)
|
||||
self.stubs.Set(db, 'instance_destroy', fake_instance_destroy)
|
||||
self.stub_out('nova.db.instance_destroy', fake_instance_destroy)
|
||||
self.body['os:scheduler_hints'] = {'group': fake_group.uuid}
|
||||
self.req.body = jsonutils.dump_as_bytes(self.body)
|
||||
expected_msg = "Quota exceeded, too many servers in group"
|
||||
|
@ -3110,7 +3108,7 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
def fake_instance_destroy(context, uuid, constraint):
|
||||
return fakes.stub_instance(1)
|
||||
|
||||
self.stubs.Set(db, 'instance_destroy', fake_instance_destroy)
|
||||
self.stub_out('nova.db.instance_destroy', fake_instance_destroy)
|
||||
self.body['os:scheduler_hints'] = {'group': test_group.uuid}
|
||||
self.req.body = jsonutils.dump_as_bytes(self.body)
|
||||
server = self.controller.create(self.req, body=self.body).obj['server']
|
||||
|
|
|
@ -20,7 +20,6 @@ import webob
|
|||
from nova.api.openstack.compute.legacy_v2.contrib import shelve as shelve_v2
|
||||
from nova.api.openstack.compute import shelve as shelve_v21
|
||||
from nova.compute import api as compute_api
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import policy
|
||||
from nova import test
|
||||
|
@ -52,7 +51,8 @@ class ShelvePolicyTestV21(test.NoDBTestCase):
|
|||
self.req, str(uuid.uuid4()), {})
|
||||
|
||||
def test_shelve_locked_server(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.stubs.Set(compute_api.API, 'shelve',
|
||||
fakes.fake_actions_to_locked_server)
|
||||
self.assertRaises(webob.exc.HTTPConflict, self.controller._shelve,
|
||||
|
@ -66,7 +66,8 @@ class ShelvePolicyTestV21(test.NoDBTestCase):
|
|||
self.req, str(uuid.uuid4()), {})
|
||||
|
||||
def test_unshelve_locked_server(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.stubs.Set(compute_api.API, 'unshelve',
|
||||
fakes.fake_actions_to_locked_server)
|
||||
self.assertRaises(webob.exc.HTTPConflict, self.controller._unshelve,
|
||||
|
@ -82,7 +83,8 @@ class ShelvePolicyTestV21(test.NoDBTestCase):
|
|||
str(uuid.uuid4()), {})
|
||||
|
||||
def test_shelve_offload_locked_server(self):
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.stubs.Set(compute_api.API, 'shelve_offload',
|
||||
fakes.fake_actions_to_locked_server)
|
||||
self.assertRaises(webob.exc.HTTPConflict,
|
||||
|
@ -100,7 +102,8 @@ class ShelvePolicyTestV2(ShelvePolicyTestV21):
|
|||
rules = {'compute:get': '',
|
||||
'compute_extension:%sshelve' % self.prefix: ''}
|
||||
policy.set_rules(oslo_policy.Rules.from_dict(rules))
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.assertRaises(exception.Forbidden, self.controller._shelve,
|
||||
self.req, str(uuid.uuid4()), {})
|
||||
|
||||
|
@ -109,7 +112,8 @@ class ShelvePolicyTestV2(ShelvePolicyTestV21):
|
|||
'compute_extension:%sunshelve' % self.prefix: ''}
|
||||
policy.set_rules(oslo_policy.Rules.from_dict(rules))
|
||||
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.assertRaises(exception.Forbidden, self.controller._unshelve,
|
||||
self.req, str(uuid.uuid4()), {})
|
||||
|
||||
|
@ -118,7 +122,8 @@ class ShelvePolicyTestV2(ShelvePolicyTestV21):
|
|||
'compute_extension:%s%s' % (self.prefix, self.offload): ''}
|
||||
policy.set_rules(oslo_policy.Rules.from_dict(rules))
|
||||
|
||||
self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get_by_uuid)
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.assertRaises(exception.Forbidden,
|
||||
self.controller._shelve_offload,
|
||||
self.req,
|
||||
|
|
|
@ -26,7 +26,6 @@ from nova.api.openstack.compute import servers
|
|||
from nova.api.openstack.compute import user_data
|
||||
from nova.compute import api as compute_api
|
||||
from nova.compute import flavors
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.network import manager
|
||||
from nova import test
|
||||
|
@ -123,17 +122,15 @@ class ServersControllerCreateTest(test.TestCase):
|
|||
fake.stub_out_image_service(self)
|
||||
fakes.stub_out_nw_api(self)
|
||||
self.stubs.Set(uuid, 'uuid4', fake_gen_uuid)
|
||||
self.stubs.Set(db, 'instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stubs.Set(db, 'project_get_networks',
|
||||
project_get_networks)
|
||||
self.stubs.Set(db, 'instance_create', instance_create)
|
||||
self.stubs.Set(db, 'instance_system_metadata_update',
|
||||
fake_method)
|
||||
self.stubs.Set(db, 'instance_get', instance_get)
|
||||
self.stubs.Set(db, 'instance_update', instance_update)
|
||||
self.stubs.Set(db, 'instance_update_and_get_original',
|
||||
server_update)
|
||||
self.stub_out('nova.db.instance_add_security_group',
|
||||
return_security_group)
|
||||
self.stub_out('nova.db.project_get_networks', project_get_networks)
|
||||
self.stub_out('nova.db.instance_create', instance_create)
|
||||
self.stub_out('nova.db.instance_system_metadata_update', fake_method)
|
||||
self.stub_out('nova.db.instance_get', instance_get)
|
||||
self.stub_out('nova.db.instance_update', instance_update)
|
||||
self.stub_out('nova.db.instance_update_and_get_original',
|
||||
server_update)
|
||||
self.stubs.Set(manager.VlanManager, 'allocate_fixed_ip',
|
||||
fake_method)
|
||||
|
||||
|
|
|
@ -33,7 +33,6 @@ from nova.api.openstack import extensions
|
|||
from nova.compute import api as compute_api
|
||||
from nova.compute import flavors
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova import test
|
||||
|
@ -366,8 +365,8 @@ class VolumeAttachTestsV21(test.NoDBTestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(VolumeAttachTestsV21, self).setUp()
|
||||
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
|
||||
fake_bdms_get_all_by_instance)
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance',
|
||||
fake_bdms_get_all_by_instance)
|
||||
self.stubs.Set(compute_api.API, 'get', fake_get_instance)
|
||||
self.stubs.Set(cinder.API, 'get', fake_get_volume)
|
||||
self.context = context.get_admin_context()
|
||||
|
|
|
@ -24,7 +24,6 @@ from oslo_db import exception as db_exc
|
|||
import six
|
||||
|
||||
from nova.cells import state
|
||||
from nova import db
|
||||
from nova.db.sqlalchemy import models
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
|
@ -104,8 +103,8 @@ class TestCellsStateManager(test.NoDBTestCase):
|
|||
_fake_compute_node_get_all)
|
||||
self.stubs.Set(objects.ServiceList, 'get_by_binary',
|
||||
_fake_service_get_all_by_binary)
|
||||
self.stubs.Set(db, 'flavor_get_all', _fake_instance_type_all)
|
||||
self.stubs.Set(db, 'cell_get_all', _fake_cell_get_all)
|
||||
self.stub_out('nova.db.flavor_get_all', _fake_instance_type_all)
|
||||
self.stub_out('nova.db.cell_get_all', _fake_cell_get_all)
|
||||
|
||||
def test_cells_config_not_found(self):
|
||||
self.flags(cells_config='no_such_file_exists.conf', group='cells')
|
||||
|
|
|
@ -208,7 +208,7 @@ class BaseTestCase(test.TestCase):
|
|||
|
||||
self.stubs.Set(self.compute, '_get_compute_nodes_in_db',
|
||||
fake_get_compute_nodes_in_db)
|
||||
self.stubs.Set(db, 'compute_node_delete',
|
||||
self.stub_out('nova.db.compute_node_delete',
|
||||
fake_compute_node_delete)
|
||||
|
||||
self.compute.update_available_resource(
|
||||
|
@ -394,8 +394,8 @@ class ComputeVolumeTestCase(BaseTestCase):
|
|||
self.cinfo = jsonutils.loads(args[-1].get('connection_info'))
|
||||
return self.fake_volume
|
||||
|
||||
self.stubs.Set(db, 'block_device_mapping_create', store_cinfo)
|
||||
self.stubs.Set(db, 'block_device_mapping_update', store_cinfo)
|
||||
self.stub_out('nova.db.block_device_mapping_create', store_cinfo)
|
||||
self.stub_out('nova.db.block_device_mapping_update', store_cinfo)
|
||||
|
||||
def test_attach_volume_serial(self):
|
||||
fake_bdm = objects.BlockDeviceMapping(context=self.context,
|
||||
|
@ -6055,7 +6055,7 @@ class ComputeTestCase(BaseTestCase):
|
|||
except NotImplementedError:
|
||||
exc_info = sys.exc_info()
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
|
||||
self.stub_out('nova.db.instance_fault_create', fake_db_fault_create)
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
compute_utils.add_instance_fault_from_exc(ctxt,
|
||||
|
@ -6090,7 +6090,7 @@ class ComputeTestCase(BaseTestCase):
|
|||
raised_exc = exc
|
||||
exc_info = sys.exc_info()
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
|
||||
self.stub_out('nova.db.instance_fault_create', fake_db_fault_create)
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
compute_utils.add_instance_fault_from_exc(ctxt,
|
||||
|
@ -6119,7 +6119,7 @@ class ComputeTestCase(BaseTestCase):
|
|||
except exception.Invalid:
|
||||
exc_info = sys.exc_info()
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
|
||||
self.stub_out('nova.db.instance_fault_create', fake_db_fault_create)
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
compute_utils.add_instance_fault_from_exc(ctxt,
|
||||
|
@ -6139,7 +6139,7 @@ class ComputeTestCase(BaseTestCase):
|
|||
self.assertEqual(expected, values)
|
||||
return self._fill_fault(expected)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
|
||||
self.stub_out('nova.db.instance_fault_create', fake_db_fault_create)
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
compute_utils.add_instance_fault_from_exc(ctxt,
|
||||
|
@ -6162,7 +6162,7 @@ class ComputeTestCase(BaseTestCase):
|
|||
self.assertEqual(expected, values)
|
||||
return self._fill_fault(expected)
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
|
||||
self.stub_out('nova.db.instance_fault_create', fake_db_fault_create)
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
compute_utils.add_instance_fault_from_exc(ctxt,
|
||||
|
@ -6191,7 +6191,7 @@ class ComputeTestCase(BaseTestCase):
|
|||
except NotImplementedError:
|
||||
exc_info = sys.exc_info()
|
||||
|
||||
self.stubs.Set(nova.db, 'instance_fault_create', fake_db_fault_create)
|
||||
self.stub_out('nova.db.instance_fault_create', fake_db_fault_create)
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
compute_utils.add_instance_fault_from_exc(ctxt,
|
||||
|
@ -6369,9 +6369,9 @@ class ComputeTestCase(BaseTestCase):
|
|||
raise exception.InstanceInfoCacheNotFound(
|
||||
instance_uuid=instance['uuid'])
|
||||
|
||||
self.stubs.Set(db, 'instance_get_all_by_host',
|
||||
self.stub_out('nova.db.instance_get_all_by_host',
|
||||
fake_instance_get_all_by_host)
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.stubs.Set(self.compute.network_api, 'get_instance_nw_info',
|
||||
fake_get_instance_nw_info)
|
||||
|
@ -6589,11 +6589,11 @@ class ComputeTestCase(BaseTestCase):
|
|||
migration['instance_uuid']):
|
||||
migration2['status'] = 'confirmed'
|
||||
|
||||
self.stubs.Set(db, 'instance_get_by_uuid',
|
||||
self.stub_out('nova.db.instance_get_by_uuid',
|
||||
fake_instance_get_by_uuid)
|
||||
self.stubs.Set(db, 'migration_get_unconfirmed_by_dest_compute',
|
||||
self.stub_out('nova.db.migration_get_unconfirmed_by_dest_compute',
|
||||
fake_migration_get_unconfirmed_by_dest_compute)
|
||||
self.stubs.Set(db, 'migration_update', fake_migration_update)
|
||||
self.stub_out('nova.db.migration_update', fake_migration_update)
|
||||
self.stubs.Set(self.compute.compute_api, 'confirm_resize',
|
||||
fake_confirm_resize)
|
||||
|
||||
|
@ -6877,8 +6877,8 @@ class ComputeTestCase(BaseTestCase):
|
|||
|
||||
self.stubs.Set(instance, 'destroy', fake_destroy)
|
||||
|
||||
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
|
||||
lambda *a, **k: None)
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance',
|
||||
lambda *a, **k: None)
|
||||
|
||||
self.stubs.Set(self.compute,
|
||||
'_complete_deletion',
|
||||
|
|
|
@ -2128,8 +2128,8 @@ class _ComputeAPIUnitTestMixIn(object):
|
|||
def fake_unquiesce_instance(context, instance, mapping=None):
|
||||
quiesced[1] = True
|
||||
|
||||
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
|
||||
fake_get_all_by_instance)
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance',
|
||||
fake_get_all_by_instance)
|
||||
self.stubs.Set(self.compute_api.image_api, 'create',
|
||||
fake_image_create)
|
||||
self.stubs.Set(self.compute_api.volume_api, 'get',
|
||||
|
|
|
@ -1717,20 +1717,19 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
|
|||
fake_vol_unreserve)
|
||||
self.stubs.Set(self.compute.volume_api, 'terminate_connection',
|
||||
fake_vol_api_func)
|
||||
self.stubs.Set(db,
|
||||
'block_device_mapping_get_by_instance_and_volume_id',
|
||||
lambda x, y, z, v: fake_bdm)
|
||||
self.stub_out('nova.db.'
|
||||
'block_device_mapping_get_by_instance_and_volume_id',
|
||||
lambda x, y, z, v: fake_bdm)
|
||||
self.stubs.Set(self.compute.driver, 'get_volume_connector',
|
||||
lambda x: {})
|
||||
self.stubs.Set(self.compute.driver, 'swap_volume',
|
||||
fake_swap_volume)
|
||||
self.stubs.Set(self.compute.volume_api, 'migrate_volume_completion',
|
||||
fake_vol_migrate_volume_completion)
|
||||
self.stubs.Set(db, 'block_device_mapping_update',
|
||||
fake_block_device_mapping_update)
|
||||
self.stubs.Set(db,
|
||||
'instance_fault_create',
|
||||
lambda x, y:
|
||||
self.stub_out('nova.db.block_device_mapping_update',
|
||||
fake_block_device_mapping_update)
|
||||
self.stub_out('nova.db.instance_fault_create',
|
||||
lambda x, y:
|
||||
test_instance_fault.fake_faults['fake-uuid'][0])
|
||||
self.stubs.Set(self.compute, '_instance_update',
|
||||
lambda c, u, **k: {})
|
||||
|
|
|
@ -31,7 +31,6 @@ from nova.compute import power_state
|
|||
from nova.compute import task_states
|
||||
from nova.compute import utils as compute_utils
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.image import glance
|
||||
from nova.network import api as network_api
|
||||
|
@ -103,8 +102,8 @@ class ComputeValidateDeviceTestCase(test.NoDBTestCase):
|
|||
|
||||
self.data = []
|
||||
|
||||
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
|
||||
lambda context, instance: self.data)
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance',
|
||||
lambda context, instance: self.data)
|
||||
|
||||
def _validate_device(self, device=None):
|
||||
bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
|
||||
|
|
|
@ -20,7 +20,6 @@ import six
|
|||
|
||||
from nova.compute import api as compute_api
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova.objects import keypair as keypair_obj
|
||||
from nova import quota
|
||||
|
@ -76,14 +75,11 @@ class KeypairAPITestCase(test_compute.BaseTestCase):
|
|||
else:
|
||||
raise exception.KeypairNotFound(user_id=user_id, name=name)
|
||||
|
||||
self.stubs.Set(db, "key_pair_get_all_by_user",
|
||||
self.stub_out("nova.db.key_pair_get_all_by_user",
|
||||
db_key_pair_get_all_by_user)
|
||||
self.stubs.Set(db, "key_pair_create",
|
||||
db_key_pair_create)
|
||||
self.stubs.Set(db, "key_pair_destroy",
|
||||
db_key_pair_destroy)
|
||||
self.stubs.Set(db, "key_pair_get",
|
||||
db_key_pair_get)
|
||||
self.stub_out("nova.db.key_pair_create", db_key_pair_create)
|
||||
self.stub_out("nova.db.key_pair_destroy", db_key_pair_destroy)
|
||||
self.stub_out("nova.db.key_pair_get", db_key_pair_get)
|
||||
|
||||
def _check_notifications(self, action='create', key_name='foo'):
|
||||
self.assertEqual(2, len(fake_notifier.NOTIFICATIONS))
|
||||
|
@ -146,7 +142,7 @@ class CreateImportSharedTestMixIn(object):
|
|||
def db_key_pair_create_duplicate(context, keypair):
|
||||
raise exception.KeyPairExists(key_name=keypair.get('name', ''))
|
||||
|
||||
self.stubs.Set(db, "key_pair_create", db_key_pair_create_duplicate)
|
||||
self.stub_out("nova.db.key_pair_create", db_key_pair_create_duplicate)
|
||||
|
||||
msg = ("Key pair '%(key_name)s' already exists." %
|
||||
{'key_name': self.existing_key_name})
|
||||
|
|
|
@ -18,7 +18,6 @@ from oslo_config import cfg
|
|||
from oslo_utils import importutils
|
||||
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import objects
|
||||
from nova import test
|
||||
from nova.virt import fake
|
||||
|
@ -110,7 +109,7 @@ class MultiNodeComputeTestCase(BaseTestCase):
|
|||
|
||||
self.stubs.Set(self.compute, '_get_compute_nodes_in_db',
|
||||
fake_get_compute_nodes_in_db)
|
||||
self.stubs.Set(db, 'compute_node_delete',
|
||||
self.stub_out('nova.db.compute_node_delete',
|
||||
fake_compute_node_delete)
|
||||
|
||||
def test_update_available_resource_add_remove_node(self):
|
||||
|
@ -152,7 +151,7 @@ class MultiNodeComputeTestCase(BaseTestCase):
|
|||
|
||||
self.stubs.Set(self.compute, '_get_compute_nodes_in_db',
|
||||
fake_get_compute_nodes_in_db)
|
||||
self.stubs.Set(db, 'compute_node_delete',
|
||||
self.stub_out('nova.db.compute_node_delete',
|
||||
fake_compute_node_delete)
|
||||
|
||||
self.compute.update_available_resource(ctx)
|
||||
|
|
|
@ -31,7 +31,6 @@ from nova.compute import resources
|
|||
from nova.compute import task_states
|
||||
from nova.compute import vm_states
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import objects
|
||||
from nova.objects import base as obj_base
|
||||
|
@ -522,11 +521,11 @@ class MissingComputeNodeTestCase(BaseTestCase):
|
|||
super(MissingComputeNodeTestCase, self).setUp()
|
||||
self.tracker = self._tracker()
|
||||
|
||||
self.stubs.Set(db, 'service_get_by_compute_host',
|
||||
self.stub_out('nova.db.service_get_by_compute_host',
|
||||
self._fake_service_get_by_compute_host)
|
||||
self.stubs.Set(db, 'compute_node_get_by_host_and_nodename',
|
||||
self.stub_out('nova.db.compute_node_get_by_host_and_nodename',
|
||||
self._fake_compute_node_get_by_host_and_nodename)
|
||||
self.stubs.Set(db, 'compute_node_create',
|
||||
self.stub_out('nova.db.compute_node_create',
|
||||
self._fake_create_compute_node)
|
||||
self.tracker.scheduler_client.update_resource_stats = mock.Mock()
|
||||
|
||||
|
@ -563,17 +562,17 @@ class BaseTrackerTestCase(BaseTestCase):
|
|||
self.tracker = self._tracker()
|
||||
self._migrations = {}
|
||||
|
||||
self.stubs.Set(db, 'service_get_by_compute_host',
|
||||
self.stub_out('nova.db.service_get_by_compute_host',
|
||||
self._fake_service_get_by_compute_host)
|
||||
self.stubs.Set(db, 'compute_node_get_by_host_and_nodename',
|
||||
self.stub_out('nova.db.compute_node_get_by_host_and_nodename',
|
||||
self._fake_compute_node_get_by_host_and_nodename)
|
||||
self.stubs.Set(db, 'compute_node_update',
|
||||
self.stub_out('nova.db.compute_node_update',
|
||||
self._fake_compute_node_update)
|
||||
self.stubs.Set(db, 'compute_node_delete',
|
||||
self.stub_out('nova.db.compute_node_delete',
|
||||
self._fake_compute_node_delete)
|
||||
self.stubs.Set(db, 'migration_update',
|
||||
self.stub_out('nova.db.migration_update',
|
||||
self._fake_migration_update)
|
||||
self.stubs.Set(db, 'migration_get_in_progress_by_host_and_node',
|
||||
self.stub_out('nova.db.migration_get_in_progress_by_host_and_node',
|
||||
self._fake_migration_get_in_progress_by_host_and_node)
|
||||
|
||||
# Note that this must be called before the call to _init_tracker()
|
||||
|
|
|
@ -21,7 +21,6 @@ import datetime
|
|||
|
||||
import six
|
||||
|
||||
from nova import db
|
||||
from nova import exception
|
||||
|
||||
|
||||
|
@ -46,12 +45,12 @@ class FakeModel(object):
|
|||
return self.values[name]
|
||||
|
||||
|
||||
def stub_out(stubs, funcs):
|
||||
def stub_out(test, funcs):
|
||||
"""Set the stubs in mapping in the db api."""
|
||||
for func in funcs:
|
||||
func_name = '_'.join(func.__name__.split('_')[1:])
|
||||
stubs.Set(db, func_name, func)
|
||||
stubs.Set(db.api, func_name, func)
|
||||
test.stub_out('nova.db.' + func_name, func)
|
||||
test.stub_out('nova.db.api.' + func_name, func)
|
||||
|
||||
|
||||
fixed_ip_fields = {'id': 0,
|
||||
|
@ -311,7 +310,7 @@ def fake_project_get_networks(context, project_id):
|
|||
if n['project_id'] == project_id]
|
||||
|
||||
|
||||
def stub_out_db_network_api(stubs):
|
||||
def stub_out_db_network_api(test):
|
||||
|
||||
funcs = [fake_floating_ip_allocate_address,
|
||||
fake_floating_ip_deallocate,
|
||||
|
@ -341,10 +340,10 @@ def stub_out_db_network_api(stubs):
|
|||
fake_network_update,
|
||||
fake_project_get_networks]
|
||||
|
||||
stub_out(stubs, funcs)
|
||||
stub_out(test, funcs)
|
||||
|
||||
|
||||
def stub_out_db_instance_api(stubs, injected=True):
|
||||
def stub_out_db_instance_api(test, injected=True):
|
||||
"""Stubs out the db API for creating Instances."""
|
||||
|
||||
def _create_instance_type(**updates):
|
||||
|
@ -450,4 +449,4 @@ def stub_out_db_instance_api(stubs, injected=True):
|
|||
fake_flavor_get_by_name,
|
||||
fake_flavor_get,
|
||||
fake_fixed_ip_get_by_instance]
|
||||
stub_out(stubs, funcs)
|
||||
stub_out(test, funcs)
|
||||
|
|
|
@ -394,9 +394,10 @@ class LinuxNetworkTestCase(test.NoDBTestCase):
|
|||
def get_instance(_context, instance_id):
|
||||
return instances[instance_id]
|
||||
|
||||
self.stubs.Set(db, 'virtual_interface_get_by_instance', get_vifs)
|
||||
self.stubs.Set(db, 'instance_get', get_instance)
|
||||
self.stubs.Set(db, 'network_get_associated_fixed_ips', get_associated)
|
||||
self.stub_out('nova.db.virtual_interface_get_by_instance', get_vifs)
|
||||
self.stub_out('nova.db.instance_get', get_instance)
|
||||
self.stub_out('nova.db.network_get_associated_fixed_ips',
|
||||
get_associated)
|
||||
|
||||
def _test_add_snat_rule(self, expected, is_external):
|
||||
|
||||
|
|
|
@ -1688,7 +1688,7 @@ class VlanNetworkTestCase(test.TestCase):
|
|||
def vif_get(_context, _vif_id):
|
||||
return vifs[0]
|
||||
|
||||
self.stubs.Set(db, 'virtual_interface_get', vif_get)
|
||||
self.stub_out('nova.db.virtual_interface_get', vif_get)
|
||||
context1 = context.RequestContext('user', 'project1')
|
||||
|
||||
instance = db.instance_create(context1,
|
||||
|
@ -1814,7 +1814,7 @@ class VlanNetworkTestCase(test.TestCase):
|
|||
def vif_get(_context, _vif_id):
|
||||
return None
|
||||
|
||||
self.stubs.Set(db, 'virtual_interface_get', vif_get)
|
||||
self.stub_out('nova.db.virtual_interface_get', vif_get)
|
||||
context1 = context.RequestContext('user', 'project1')
|
||||
|
||||
instance = db.instance_create(context1,
|
||||
|
@ -1946,7 +1946,7 @@ class CommonNetworkTestCase(test.TestCase):
|
|||
def dnsdomain_get(context, instance_domain):
|
||||
return domains.get(instance_domain)
|
||||
|
||||
self.stubs.Set(db, 'dnsdomain_get', dnsdomain_get)
|
||||
self.stub_out('nova.db.dnsdomain_get', dnsdomain_get)
|
||||
fake_instance = {'uuid': FAKEUUID,
|
||||
'availability_zone': az}
|
||||
|
||||
|
|
|
@ -232,7 +232,7 @@ class _TestPciDeviceObject(object):
|
|||
return return_dev
|
||||
|
||||
ctxt = context.get_admin_context()
|
||||
self.stubs.Set(db, 'pci_device_update', _fake_update)
|
||||
self.stub_out('nova.db.pci_device_update', _fake_update)
|
||||
self.pci_device = pci_device.PciDevice.create(None, dev_dict)
|
||||
self.pci_device._context = ctxt
|
||||
self.pci_device.save()
|
||||
|
@ -255,8 +255,8 @@ class _TestPciDeviceObject(object):
|
|||
|
||||
def _fake_update(ctxt, node_id, addr, updates):
|
||||
self.called = True
|
||||
self.stubs.Set(db, 'pci_device_destroy', _fake_destroy)
|
||||
self.stubs.Set(db, 'pci_device_update', _fake_update)
|
||||
self.stub_out('nova.db.pci_device_destroy', _fake_destroy)
|
||||
self.stub_out('nova.db.pci_device_update', _fake_update)
|
||||
self._create_fake_pci_device()
|
||||
self.pci_device.status = fields.PciDeviceStatus.DELETED
|
||||
self.called = False
|
||||
|
|
|
@ -107,7 +107,7 @@ class RevokeCertsTest(test.TestCase):
|
|||
"file_name": file_name}]
|
||||
|
||||
self.stub_out('nova.db.certificate_get_all_by_user_and_project',
|
||||
mock_certificate_get_all_by_user_and_project)
|
||||
mock_certificate_get_all_by_user_and_project)
|
||||
|
||||
crypto.revoke_certs_by_user_and_project(user_id, project_id)
|
||||
|
||||
|
@ -125,7 +125,7 @@ class RevokeCertsTest(test.TestCase):
|
|||
"file_name": file_name}]
|
||||
|
||||
self.stub_out('nova.db.certificate_get_all_by_user',
|
||||
mock_certificate_get_all_by_user)
|
||||
mock_certificate_get_all_by_user)
|
||||
|
||||
crypto.revoke_certs_by_user(user_id)
|
||||
mock_revoke.assert_called_once_with(project_id, mock.ANY)
|
||||
|
@ -142,7 +142,7 @@ class RevokeCertsTest(test.TestCase):
|
|||
"file_name": file_name}]
|
||||
|
||||
self.stub_out('nova.db.certificate_get_all_by_project',
|
||||
mock_certificate_get_all_by_project)
|
||||
mock_certificate_get_all_by_project)
|
||||
|
||||
crypto.revoke_certs_by_project(project_id)
|
||||
mock_revoke.assert_called_once_with(project_id, mock.ANY)
|
||||
|
|
|
@ -248,7 +248,7 @@ class MetadataTestCase(test.TestCase):
|
|||
'device_name': '/dev/sdb'})]
|
||||
|
||||
self.stub_out('nova.db.block_device_mapping_get_all_by_instance',
|
||||
fake_bdm_get)
|
||||
fake_bdm_get)
|
||||
|
||||
expected = {'ami': 'sda1',
|
||||
'root': '/dev/sda1',
|
||||
|
|
|
@ -36,7 +36,7 @@ from nova.tests.unit import test_flavors
|
|||
class FixedIpCommandsTestCase(test.TestCase):
|
||||
def setUp(self):
|
||||
super(FixedIpCommandsTestCase, self).setUp()
|
||||
db_fakes.stub_out_db_network_api(self.stubs)
|
||||
db_fakes.stub_out_db_network_api(self)
|
||||
self.commands = manage.FixedIpCommands()
|
||||
|
||||
def test_reserve(self):
|
||||
|
@ -79,7 +79,7 @@ class FixedIpCommandsTestCase(test.TestCase):
|
|||
class FloatingIpCommandsTestCase(test.TestCase):
|
||||
def setUp(self):
|
||||
super(FloatingIpCommandsTestCase, self).setUp()
|
||||
db_fakes.stub_out_db_network_api(self.stubs)
|
||||
db_fakes.stub_out_db_network_api(self)
|
||||
self.commands = manage.FloatingIpCommands()
|
||||
|
||||
def test_address_to_hosts(self):
|
||||
|
@ -211,7 +211,7 @@ class NetworkCommandsTestCase(test.TestCase):
|
|||
|
||||
def fake_network_get_all(context):
|
||||
return [db_fakes.FakeModel(self.net)]
|
||||
self.stubs.Set(db, 'network_get_all', fake_network_get_all)
|
||||
self.stub_out('nova.db.network_get_all', fake_network_get_all)
|
||||
output = StringIO()
|
||||
sys.stdout = output
|
||||
self.commands.list()
|
||||
|
@ -245,35 +245,35 @@ class NetworkCommandsTestCase(test.TestCase):
|
|||
self.fake_net = self.net
|
||||
self.fake_net['project_id'] = None
|
||||
self.fake_net['host'] = None
|
||||
self.stubs.Set(db, 'network_get_by_uuid',
|
||||
self.fake_network_get_by_uuid)
|
||||
self.stub_out('nova.db.network_get_by_uuid',
|
||||
self.fake_network_get_by_uuid)
|
||||
|
||||
def fake_network_delete_safe(context, network_id):
|
||||
self.assertTrue(context.to_dict()['is_admin'])
|
||||
self.assertEqual(network_id, self.fake_net['id'])
|
||||
self.stubs.Set(db, 'network_delete_safe', fake_network_delete_safe)
|
||||
self.stub_out('nova.db.network_delete_safe', fake_network_delete_safe)
|
||||
self.commands.delete(uuid=self.fake_net['uuid'])
|
||||
|
||||
def test_delete_by_cidr(self):
|
||||
self.fake_net = self.net
|
||||
self.fake_net['project_id'] = None
|
||||
self.fake_net['host'] = None
|
||||
self.stubs.Set(db, 'network_get_by_cidr',
|
||||
self.fake_network_get_by_cidr)
|
||||
self.stub_out('nova.db.network_get_by_cidr',
|
||||
self.fake_network_get_by_cidr)
|
||||
|
||||
def fake_network_delete_safe(context, network_id):
|
||||
self.assertTrue(context.to_dict()['is_admin'])
|
||||
self.assertEqual(network_id, self.fake_net['id'])
|
||||
self.stubs.Set(db, 'network_delete_safe', fake_network_delete_safe)
|
||||
self.stub_out('nova.db.network_delete_safe', fake_network_delete_safe)
|
||||
self.commands.delete(fixed_range=self.fake_net['cidr'])
|
||||
|
||||
def _test_modify_base(self, update_value, project, host, dis_project=None,
|
||||
dis_host=None):
|
||||
self.fake_net = self.net
|
||||
self.fake_update_value = update_value
|
||||
self.stubs.Set(db, 'network_get_by_cidr',
|
||||
self.fake_network_get_by_cidr)
|
||||
self.stubs.Set(db, 'network_update', self.fake_network_update)
|
||||
self.stub_out('nova.db.network_get_by_cidr',
|
||||
self.fake_network_get_by_cidr)
|
||||
self.stub_out('nova.db.network_update', self.fake_network_update)
|
||||
self.commands.modify(self.fake_net['cidr'], project=project, host=host,
|
||||
dis_project=dis_project, dis_host=dis_host)
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@ from six.moves import cStringIO
|
|||
|
||||
from nova import conductor
|
||||
from nova import context
|
||||
from nova import db
|
||||
from nova import objects
|
||||
from nova import test
|
||||
from nova.tests.unit import fake_instance
|
||||
|
@ -836,8 +835,8 @@ class ImageCacheManagerTestCase(test.NoDBTestCase):
|
|||
with utils.tempdir() as tmpdir:
|
||||
self.flags(instances_path=tmpdir)
|
||||
|
||||
self.stubs.Set(db, 'instance_get_all_by_filters',
|
||||
fake_get_all_by_filters)
|
||||
self.stub_out('nova.db.instance_get_all_by_filters',
|
||||
fake_get_all_by_filters)
|
||||
compute = importutils.import_object(CONF.compute_manager)
|
||||
self.flags(use_local=True, group='conductor')
|
||||
compute.conductor_api = conductor.API()
|
||||
|
|
|
@ -297,7 +297,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase):
|
|||
self.flags(connection_url='test_url',
|
||||
connection_password='test_pass',
|
||||
group='xenserver')
|
||||
db_fakes.stub_out_db_instance_api(self.stubs)
|
||||
db_fakes.stub_out_db_instance_api(self)
|
||||
xenapi_fake.create_network('fake', 'fake_br1')
|
||||
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
|
||||
stubs.stubout_get_this_vm_uuid(self.stubs)
|
||||
|
@ -933,7 +933,7 @@ class XenAPIVMTestCase(stubs.XenAPITestBase):
|
|||
'IPv6 pretty-printing broken on OSX, see bug 1409135')
|
||||
def test_spawn_netinject_file(self):
|
||||
self.flags(flat_injected=True)
|
||||
db_fakes.stub_out_db_instance_api(self.stubs, injected=True)
|
||||
db_fakes.stub_out_db_instance_api(self, injected=True)
|
||||
|
||||
self._tee_executed = False
|
||||
|
||||
|
@ -984,7 +984,7 @@ iface eth0 inet6 static
|
|||
@testtools.skipIf(test_utils.is_osx(),
|
||||
'IPv6 pretty-printing broken on OSX, see bug 1409135')
|
||||
def test_spawn_netinject_xenstore(self):
|
||||
db_fakes.stub_out_db_instance_api(self.stubs, injected=True)
|
||||
db_fakes.stub_out_db_instance_api(self, injected=True)
|
||||
|
||||
self._tee_executed = False
|
||||
|
||||
|
@ -1440,8 +1440,8 @@ iface eth0 inet6 static
|
|||
return [test_aggregate.fake_aggregate]
|
||||
else:
|
||||
return []
|
||||
self.stubs.Set(db, 'aggregate_get_by_host',
|
||||
fake_aggregate_get)
|
||||
self.stub_out('nova.db.aggregate_get_by_host',
|
||||
fake_aggregate_get)
|
||||
|
||||
def fake_host_find(context, session, src, dst):
|
||||
if find_host:
|
||||
|
@ -1494,7 +1494,7 @@ iface eth0 inet6 static
|
|||
def fake_aggregate_get_by_host(self, *args, **kwargs):
|
||||
was['called'] = True
|
||||
raise test.TestingException()
|
||||
self.stubs.Set(db, "aggregate_get_by_host",
|
||||
self.stub_out("nova.db.aggregate_get_by_host",
|
||||
fake_aggregate_get_by_host)
|
||||
|
||||
self.stubs.Set(self.conn._session, "is_slave", True)
|
||||
|
@ -1508,8 +1508,8 @@ iface eth0 inet6 static
|
|||
agg = copy.copy(test_aggregate.fake_aggregate)
|
||||
agg['metadetails'][CONF.host] = 'this_should_be_metadata'
|
||||
return [agg]
|
||||
self.stubs.Set(db, 'aggregate_get_by_host',
|
||||
fake_aggregate_get)
|
||||
self.stub_out('nova.db.aggregate_get_by_host',
|
||||
fake_aggregate_get)
|
||||
|
||||
self.stubs.Set(self.conn._session, "is_slave", True)
|
||||
|
||||
|
@ -1653,7 +1653,7 @@ class XenAPIMigrateInstance(stubs.XenAPITestBase):
|
|||
self.flags(firewall_driver='nova.virt.xenapi.firewall.'
|
||||
'Dom0IptablesFirewallDriver')
|
||||
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
|
||||
db_fakes.stub_out_db_instance_api(self.stubs)
|
||||
db_fakes.stub_out_db_instance_api(self)
|
||||
xenapi_fake.create_network('fake', 'fake_br1')
|
||||
self.user_id = 'fake'
|
||||
self.project_id = 'fake'
|
||||
|
@ -2410,7 +2410,7 @@ class XenAPIGenerateLocal(stubs.XenAPITestBase):
|
|||
self.flags(firewall_driver='nova.virt.xenapi.firewall.'
|
||||
'Dom0IptablesFirewallDriver')
|
||||
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
|
||||
db_fakes.stub_out_db_instance_api(self.stubs)
|
||||
db_fakes.stub_out_db_instance_api(self)
|
||||
self.conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False)
|
||||
|
||||
self.user_id = 'fake'
|
||||
|
@ -3378,7 +3378,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
|
|||
self.flags(firewall_driver='nova.virt.xenapi.firewall.'
|
||||
'Dom0IptablesFirewallDriver',
|
||||
host='host')
|
||||
db_fakes.stub_out_db_instance_api(self.stubs)
|
||||
db_fakes.stub_out_db_instance_api(self)
|
||||
self.context = context.get_admin_context()
|
||||
|
||||
def test_live_migration_calls_vmops(self):
|
||||
|
@ -3607,7 +3607,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
|
|||
return [dict(test_aggregate.fake_aggregate,
|
||||
metadetails={"host": "test_host_uuid"})]
|
||||
|
||||
self.stubs.Set(db, "aggregate_get_by_host",
|
||||
self.stub_out("nova.db.aggregate_get_by_host",
|
||||
fake_aggregate_get_by_host)
|
||||
self.conn.check_can_live_migrate_destination(self.context,
|
||||
{'host': 'host'}, False, False)
|
||||
|
@ -3621,7 +3621,7 @@ class XenAPILiveMigrateTestCase(stubs.XenAPITestBaseNoDB):
|
|||
return [dict(test_aggregate.fake_aggregate,
|
||||
metadetails={"dest_other": "test_host_uuid"})]
|
||||
|
||||
self.stubs.Set(db, "aggregate_get_by_host",
|
||||
self.stub_out("nova.db.aggregate_get_by_host",
|
||||
fake_aggregate_get_by_host)
|
||||
self.assertRaises(exception.MigrationError,
|
||||
self.conn.check_can_live_migrate_destination,
|
||||
|
|
Loading…
Reference in New Issue