openstack/nova
Code Issues Proposed changes

Merge "objects: you want'em"

Browse Source
This commit is contained in:
Jenkins
2016-06-21 15:12:46 +00:00
committed by Gerrit Code Review
parent b52ec86bc0 6e8c84d0cd
commit 04f2d81bb4
28 changed files with 77 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova/api/openstack/common.py
View File

@@ -499,7 +499,6 @@ def get_instance(compute_api, context, instance_id, expected_attrs=None):
"""Fetch an instance from the compute API, handling error checking."""
try:
return compute_api.get(context, instance_id,
want_objects=True,
expected_attrs=expected_attrs)
except exception.InstanceNotFound as e:
raise exc.HTTPNotFound(explanation=e.format_message())

3
nova/api/openstack/compute/cloudpipe.py
View File

@@ -57,8 +57,7 @@ class CloudpipeController(wsgi.Controller):
def _get_all_cloudpipes(self, context):
"""Get all cloudpipes."""
instances = self.compute_api.get_all(context,
search_opts={'deleted': False},
want_objects=True)
search_opts={'deleted': False})
return [instance for instance in instances
if pipelib.is_vpn_image(instance.image_ref)
and instance.vm_state != vm_states.DELETED]

2
nova/api/openstack/compute/fping.py
View File

@@ -94,7 +94,7 @@ class FpingController(wsgi.Controller):
exclude = set()
instance_list = self.compute_api.get_all(
context, search_opts=search_opts, want_objects=True)
context, search_opts=search_opts)
ip_list = []
instance_ips = {}
instance_projects = {}

2
nova/api/openstack/compute/servers.py
View File

@@ -393,7 +393,7 @@ class ServersController(wsgi.Controller):
try:
instance_list = self.compute_api.get_all(elevated or context,
search_opts=search_opts, limit=limit, marker=marker,
want_objects=True, expected_attrs=expected_attrs,
expected_attrs=expected_attrs,
sort_keys=sort_keys, sort_dirs=sort_dirs)
except exception.MarkerNotFound:
msg = _('marker [%s] not found') % marker

25
nova/compute/api.py
View File

@@ -1939,8 +1939,7 @@ class API(base.Base):
self.compute_rpcapi.trigger_crash_dump(context, instance)
def get(self, context, instance_id, want_objects=False,
expected_attrs=None):
def get(self, context, instance_id, expected_attrs=None):
"""Get a single instance with the given instance_id."""
if not expected_attrs:
expected_attrs = []
@@ -1960,13 +1959,10 @@ class API(base.Base):
LOG.debug("Invalid instance id %s", instance_id)
raise exception.InstanceNotFound(instance_id=instance_id)
if not want_objects:
instance = obj_base.obj_to_primitive(instance)
return instance
def get_all(self, context, search_opts=None, limit=None, marker=None,
want_objects=False, expected_attrs=None, sort_keys=None,
sort_dirs=None):
expected_attrs=None, sort_keys=None, sort_dirs=None):
"""Get all instances filtered by one of the given parameters.
If there is no filter and the context is an admin, it will retrieve
@@ -2036,10 +2032,7 @@ class API(base.Base):
# We already know we can't match the filter, so
# return an empty list
except ValueError:
if want_objects:
return objects.InstanceList()
else:
return []
return objects.InstanceList()
# IP address filtering cannot be applied at the DB layer, remove any DB
# limit so that it can be applied after the IP filter.
@@ -2049,20 +2042,12 @@ class API(base.Base):
LOG.debug('Removing limit for DB query due to IP filter')
limit = None
inst_models = self._get_instances_by_filters(context, filters,
instances = self._get_instances_by_filters(context, filters,
limit=limit, marker=marker, expected_attrs=expected_attrs,
sort_keys=sort_keys, sort_dirs=sort_dirs)
if filter_ip:
inst_models = self._ip_filter(inst_models, filters, orig_limit)
if want_objects:
return inst_models
# Convert the models to dictionaries
instances = []
for inst_model in inst_models:
instances.append(obj_base.obj_to_primitive(inst_model))
instances = self._ip_filter(instances, filters, orig_limit)
return instances

3
nova/tests/functional/api_sample_tests/test_instance_actions.py
View File

@@ -35,8 +35,7 @@ class ServerActionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
self.events = fake_server_actions.FAKE_EVENTS
self.instance = test_utils.get_test_instance(obj=True)
def _fake_get(stub_self, context, instance_uuid, expected_attrs=None,
want_objects=True):
def _fake_get(stub_self, context, instance_uuid, expected_attrs=None):
return fake_instance.fake_instance_obj(
None, **{'uuid': instance_uuid})

9
nova/tests/functional/api_sample_tests/test_volumes.py
View File

@@ -217,12 +217,9 @@ class VolumeAttachmentsSample(test_servers.ServersSampleBase):
def _stub_compute_api_get(self):
def fake_compute_api_get(self, context, instance_id,
want_objects=False, expected_attrs=None):
if want_objects:
return fake_instance.fake_instance_obj(
context, **{'uuid': instance_id})
else:
return {'uuid': instance_id}
expected_attrs=None):
return fake_instance.fake_instance_obj(
context, **{'uuid': instance_id})
self.stub_out('nova.compute.api.API.get', fake_compute_api_get)

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

@@ -36,15 +36,15 @@ class CommonMixin(object):
instance = fake_instance.fake_instance_obj(self.context,
id=1, uuid=uuid, vm_state=vm_states.ACTIVE,
task_state=None, launched_at=timeutils.utcnow())
self.compute_api.get(self.context, uuid, expected_attrs=None,
want_objects=True).AndReturn(instance)
self.compute_api.get(
self.context, uuid, expected_attrs=None).AndReturn(instance)
return instance
def _stub_instance_get_failure(self, exc_info, uuid=None):
if uuid is None:
uuid = uuidutils.generate_uuid()
self.compute_api.get(self.context, uuid, expected_attrs=None,
want_objects=True).AndRaise(exc_info)
self.compute_api.get(
self.context, uuid, expected_attrs=None).AndRaise(exc_info)
return uuid
def _test_non_existing_instance(self, action, body_map=None):

2
nova/tests/unit/api/openstack/compute/test_admin_password.py
View File

@@ -22,7 +22,7 @@ from nova import test
from nova.tests.unit.api.openstack import fakes
def fake_get(self, context, id, expected_attrs=None, want_objects=False):
def fake_get(self, context, id, expected_attrs=None):
return {'uuid': id}

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

@@ -350,7 +350,6 @@ class InterfaceAttachTestsV21(test.NoDBTestCase):
attach_mock.assert_called_once_with(ctxt, fake_instance, None,
None, None)
get_mock.assert_called_once_with(ctxt, FAKE_UUID1,
want_objects=True,
expected_attrs=None)
@mock.patch.object(compute_api.API, 'get')
@@ -370,7 +369,6 @@ class InterfaceAttachTestsV21(test.NoDBTestCase):
attach_mock.assert_called_once_with(ctxt, fake_instance, None,
None, None)
get_mock.assert_called_once_with(ctxt, FAKE_UUID1,
want_objects=True,
expected_attrs=None)
@mock.patch.object(compute_api.API, 'get')
@@ -391,7 +389,6 @@ class InterfaceAttachTestsV21(test.NoDBTestCase):
attach_mock.assert_called_once_with(ctxt, fake_instance, None,
None, None)
get_mock.assert_called_once_with(ctxt, FAKE_UUID1,
want_objects=True,
expected_attrs=None)
@mock.patch.object(compute_api.API, 'get')
@@ -408,7 +405,6 @@ class InterfaceAttachTestsV21(test.NoDBTestCase):
attach_mock.assert_called_once_with(ctxt, fake_instance, None,
None, None)
get_mock.assert_called_once_with(ctxt, FAKE_UUID1,
want_objects=True,
expected_attrs=None)
@mock.patch.object(compute_api.API, 'get')
@@ -428,7 +424,6 @@ class InterfaceAttachTestsV21(test.NoDBTestCase):
attach_mock.assert_called_once_with(ctxt, fake_instance, None,
None, None)
get_mock.assert_called_once_with(ctxt, FAKE_UUID1,
want_objects=True,
expected_attrs=None)
def _test_attach_interface_with_invalid_parameter(self, param):

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

@@ -43,11 +43,11 @@ def fake_vpn_instance():
uuid=uuid, project_id=project_id)
def compute_api_get_all_empty(context, search_opts=None, want_objects=True):
def compute_api_get_all_empty(context, search_opts=None):
return []
def compute_api_get_all(context, search_opts=None, want_objects=True):
def compute_api_get_all(context, search_opts=None):
return [fake_vpn_instance()]

3
nova/tests/unit/api/openstack/compute/test_console_output.py
View File

@@ -48,8 +48,7 @@ def fake_get_console_output_all_characters(self, _ctx, _instance, _tail_len):
return string.printable
def fake_get(self, context, instance_uuid, want_objects=False,
expected_attrs=None):
def fake_get(self, context, instance_uuid, expected_attrs=None):
return fake_instance.fake_instance_obj(context, **{'uuid': instance_uuid})

14
nova/tests/unit/api/openstack/compute/test_deferred_delete.py
View File

@@ -47,8 +47,7 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
fake_instance = 'fake_instance'
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None,
want_objects=True).AndReturn(fake_instance)
expected_attrs=None).AndReturn(fake_instance)
compute_api.API.force_delete(self.fake_context, fake_instance)
self.mox.ReplayAll()
@@ -66,8 +65,7 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
self.mox.StubOutWithMock(compute_api.API, 'get')
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None,
want_objects=True).AndRaise(
expected_attrs=None).AndRaise(
exception.InstanceNotFound(instance_id='instance-0000'))
self.mox.ReplayAll()
@@ -95,8 +93,7 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
fake_instance = 'fake_instance'
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None,
want_objects=True).AndReturn(fake_instance)
expected_attrs=None).AndReturn(fake_instance)
compute_api.API.restore(self.fake_context, fake_instance)
self.mox.ReplayAll()
@@ -114,7 +111,7 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
self.mox.StubOutWithMock(compute_api.API, 'get')
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None, want_objects=True).AndRaise(
expected_attrs=None).AndRaise(
exception.InstanceNotFound(instance_id='instance-0000'))
self.mox.ReplayAll()
@@ -132,8 +129,7 @@ class DeferredDeleteExtensionTestV21(test.NoDBTestCase):
instance_uuid='fake')
compute_api.API.get(self.fake_context, self.fake_uuid,
expected_attrs=None,
want_objects=True).AndReturn(fake_instance)
expected_attrs=None).AndReturn(fake_instance)
compute_api.API.restore(self.fake_context, fake_instance).AndRaise(
exc)

3
nova/tests/unit/api/openstack/compute/test_evacuate.py
View File

@@ -35,8 +35,7 @@ def fake_compute_api(*args, **kwargs):
return True
def fake_compute_api_get(self, context, instance_id, want_objects=False,
**kwargs):
def fake_compute_api_get(self, context, instance_id, **kwargs):
# BAD_UUID is something that does not exist
if instance_id == 'BAD_UUID':
raise exception.InstanceNotFound(instance_id=instance_id)

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

@@ -64,8 +64,7 @@ def network_api_get_floating_ips_by_project(self, context):
'fixed_ip': None}]
def compute_api_get(self, context, instance_id, expected_attrs=None,
want_objects=False):
def compute_api_get(self, context, instance_id, expected_attrs=None):
return objects.Instance(uuid=FAKE_UUID, id=instance_id,
instance_type_id=1, host='bob')
@@ -599,8 +598,7 @@ class FloatingIpTestV21(test.TestCase):
def test_floating_ip_associate_invalid_instance(self):
def fake_get(self, context, id, expected_attrs=None,
want_objects=False):
def fake_get(self, context, id, expected_attrs=None):
raise exception.InstanceNotFound(instance_id=id)
self.stubs.Set(compute.api.API, "get", fake_get)

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

@@ -110,8 +110,7 @@ class InstanceActionsTestV21(test.NoDBTestCase):
instance_actions = instance_actions_v21
wsgi_api_version = os_wsgi.DEFAULT_API_VERSION
def fake_get(self, context, instance_uuid, expected_attrs=None,
want_objects=False):
def fake_get(self, context, instance_uuid, expected_attrs=None):
return objects.Instance(uuid=instance_uuid)
def setUp(self):
@@ -201,8 +200,7 @@ class InstanceActionsTestV21(test.NoDBTestCase):
FAKE_UUID, FAKE_REQUEST_ID)
def test_index_instance_not_found(self):
def fake_get(self, context, instance_uuid, expected_attrs=None,
want_objects=False):
def fake_get(self, context, instance_uuid, expected_attrs=None):
raise exception.InstanceNotFound(instance_id=instance_uuid)
self.stubs.Set(compute_api.API, 'get', fake_get)
req = self._get_http_req('os-instance-actions')
@@ -210,8 +208,7 @@ class InstanceActionsTestV21(test.NoDBTestCase):
FAKE_UUID)
def test_show_instance_not_found(self):
def fake_get(self, context, instance_uuid, expected_attrs=None,
want_objects=False):
def fake_get(self, context, instance_uuid, expected_attrs=None):
raise exception.InstanceNotFound(instance_id=instance_uuid)
self.stubs.Set(compute_api.API, 'get', fake_get)
req = self._get_http_req('os-instance-actions/fake')
@@ -222,7 +219,6 @@ class InstanceActionsTestV21(test.NoDBTestCase):
class InstanceActionsTestV221(InstanceActionsTestV21):
wsgi_api_version = "2.21"
def fake_get(self, context, instance_uuid, expected_attrs=None,
want_objects=False):
def fake_get(self, context, instance_uuid, expected_attrs=None):
self.assertEqual('yes', context.read_deleted)
return objects.Instance(uuid=instance_uuid)

3
nova/tests/unit/api/openstack/compute/test_multinic.py
View File

@@ -41,8 +41,7 @@ def compute_api_remove_fixed_ip(self, context, instance, address):
last_remove_fixed_ip = (instance['uuid'], address)
def compute_api_get(self, context, instance_id, want_objects=False,
expected_attrs=None):
def compute_api_get(self, context, instance_id, expected_attrs=None):
instance = objects.Instance()
instance.uuid = instance_id
instance.id = 1

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

@@ -95,13 +95,11 @@ def fake_get_rdp_console_not_found(self, _context, instance, _console_type):
raise exception.InstanceNotFound(instance_id=instance["uuid"])
def fake_get(self, context, instance_uuid, want_objects=False,
expected_attrs=None):
def fake_get(self, context, instance_uuid, expected_attrs=None):
return {'uuid': instance_uuid}
def fake_get_not_found(self, context, instance_uuid, want_objects=False,
expected_attrs=None):
def fake_get_not_found(self, context, instance_uuid, expected_attrs=None):
raise exception.InstanceNotFound(instance_id=instance_uuid)

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

@@ -123,8 +123,8 @@ class ServerActionsControllerTestV21(test.TestCase):
self.compute_api.get(self.context, uuid,
expected_attrs=['flavor', 'pci_devices',
'numa_topology'],
want_objects=True).AndReturn(instance)
'numa_topology']
).AndReturn(instance)
return instance
def _test_locked_instance(self, action, method=None, body_map=None,

3
nova/tests/unit/api/openstack/compute/test_server_diagnostics.py
View File

@@ -31,8 +31,7 @@ def fake_get_diagnostics(self, _context, instance_uuid):
return {'data': 'Some diagnostic info'}
def fake_instance_get(self, _context, instance_uuid, want_objects=False,
expected_attrs=None):
def fake_instance_get(self, _context, instance_uuid, expected_attrs=None):
if instance_uuid != UUID:
raise Exception("Invalid UUID")
return {'uuid': instance_uuid}

21
nova/tests/unit/api/openstack/compute/test_server_migrations.py
View File

@@ -175,8 +175,7 @@ class ServerMigrationsTestsV223(ServerMigrationsTestsV21):
self.assertEqual(migrations_in_progress, response)
m_get_instance.assert_called_once_with(self.context, SERVER_UUID,
expected_attrs=None,
want_objects=True)
expected_attrs=None)
@mock.patch('nova.compute.api.API.get')
def test_index_invalid_instance(self, m_get_instance):
@@ -186,8 +185,7 @@ class ServerMigrationsTestsV223(ServerMigrationsTestsV21):
self.req, SERVER_UUID)
m_get_instance.assert_called_once_with(self.context, SERVER_UUID,
expected_attrs=None,
want_objects=True)
expected_attrs=None)
@mock.patch('nova.compute.api.API.get_migration_by_id_and_instance')
@mock.patch('nova.compute.api.API.get')
@@ -199,8 +197,7 @@ class ServerMigrationsTestsV223(ServerMigrationsTestsV21):
self.assertEqual(migrations[0], response['migration'])
m_get_instance.assert_called_once_with(self.context, SERVER_UUID,
expected_attrs=None,
want_objects=True)
expected_attrs=None)
@mock.patch('nova.compute.api.API.get_migration_by_id_and_instance')
@mock.patch('nova.compute.api.API.get')
@@ -214,8 +211,7 @@ class ServerMigrationsTestsV223(ServerMigrationsTestsV21):
non_progress_mig.id)
m_get_instance.assert_called_once_with(self.context, SERVER_UUID,
expected_attrs=None,
want_objects=True)
expected_attrs=None)
@mock.patch('nova.compute.api.API.get_migration_by_id_and_instance')
@mock.patch('nova.compute.api.API.get')
@@ -230,8 +226,7 @@ class ServerMigrationsTestsV223(ServerMigrationsTestsV21):
non_progress_mig.id)
m_get_instance.assert_called_once_with(self.context, SERVER_UUID,
expected_attrs=None,
want_objects=True)
expected_attrs=None)
@mock.patch('nova.compute.api.API.get_migration_by_id_and_instance')
@mock.patch('nova.compute.api.API.get')
@@ -245,8 +240,7 @@ class ServerMigrationsTestsV223(ServerMigrationsTestsV21):
migrations_obj[0].id)
m_get_instance.assert_called_once_with(self.context, SERVER_UUID,
expected_attrs=None,
want_objects=True)
expected_attrs=None)
@mock.patch('nova.compute.api.API.get')
def test_show_migration_invalid_instance(self, m_get_instance):
@@ -257,8 +251,7 @@ class ServerMigrationsTestsV223(ServerMigrationsTestsV21):
migrations_obj[0].id)
m_get_instance.assert_called_once_with(self.context, SERVER_UUID,
expected_attrs=None,
want_objects=True)
expected_attrs=None)
class ServerMigrationsTestsV224(ServerMigrationsTestsV21):

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

@@ -55,8 +55,8 @@ class ResetStateTestsV21(test.NoDBTestCase):
def test_no_instance(self):
self.mox.StubOutWithMock(self.compute_api, 'get')
exc = exception.InstanceNotFound(instance_id='inst_ud')
self.compute_api.get(self.context, self.uuid, expected_attrs=None,
want_objects=True).AndRaise(exc)
self.compute_api.get(
self.context, self.uuid, expected_attrs=None).AndRaise(exc)
self.mox.ReplayAll()
self.assertRaises(webob.exc.HTTPNotFound,
@@ -82,8 +82,8 @@ class ResetStateTestsV21(test.NoDBTestCase):
"Instance.%s doesn't match" % k)
instance.obj_reset_changes()
self.compute_api.get(self.context, instance.uuid, expected_attrs=None,
want_objects=True).AndReturn(instance)
self.compute_api.get(self.context, instance.uuid,
expected_attrs=None).AndReturn(instance)
instance.save(admin_state_reset=True).WithSideEffects(check_state)
def test_reset_active(self):

36
nova/tests/unit/api/openstack/compute/test_serversV21.py
View File

@@ -694,7 +694,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
@@ -712,7 +712,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('image', search_opts)
@@ -855,7 +855,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('flavor', search_opts)
@@ -892,7 +892,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('vm_state', search_opts)
@@ -913,7 +913,7 @@ class ServersControllerTest(ControllerTest):
task_state = task_states.REBOOTING
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('task_state', search_opts)
@@ -938,7 +938,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIn('vm_state', search_opts)
self.assertEqual(search_opts['vm_state'],
@@ -972,7 +972,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIn('vm_state', search_opts)
self.assertEqual(search_opts['vm_state'], ['deleted'])
@@ -1011,8 +1011,7 @@ class ServersControllerTest(ControllerTest):
mock_get_all.assert_called_once_with(
mock.ANY, search_opts=expected_search_opts, limit=mock.ANY,
expected_attrs=['flavor', 'info_cache', 'metadata', 'pci_devices'],
marker=mock.ANY, want_objects=mock.ANY,
sort_keys=mock.ANY, sort_dirs=mock.ANY)
marker=mock.ANY, sort_keys=mock.ANY, sort_dirs=mock.ANY)
@mock.patch.object(compute_api.API, 'get_all')
def test_get_servers_deleted_filter_invalid_str(self, mock_get_all):
@@ -1035,14 +1034,13 @@ class ServersControllerTest(ControllerTest):
mock_get_all.assert_called_once_with(
mock.ANY, search_opts=expected_search_opts, limit=mock.ANY,
expected_attrs=['flavor', 'info_cache', 'metadata', 'pci_devices'],
marker=mock.ANY, want_objects=mock.ANY,
sort_keys=mock.ANY, sort_dirs=mock.ANY)
marker=mock.ANY, sort_keys=mock.ANY, sort_dirs=mock.ANY)
def test_get_servers_allows_name(self):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('name', search_opts)
@@ -1072,7 +1070,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('changes-since', search_opts)
@@ -1105,7 +1103,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
# Allowed by user
@@ -1135,7 +1133,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
# Allowed by user
@@ -1164,7 +1162,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('ip', search_opts)
@@ -1187,7 +1185,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('ip6', search_opts)
@@ -1211,7 +1209,7 @@ class ServersControllerTest(ControllerTest):
server_uuid = str(uuid.uuid4())
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertIsNotNone(search_opts)
self.assertIn('ip6', search_opts)
@@ -1294,7 +1292,7 @@ class ServersControllerTest(ControllerTest):
def test_get_servers_joins_pci_devices(self):
def fake_get_all(compute_self, context, search_opts=None,
limit=None, marker=None, want_objects=False,
limit=None, marker=None,
expected_attrs=None, sort_keys=None, sort_dirs=None):
self.assertEqual(['pci_devices'], expected_attrs)
return []

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

@@ -31,8 +31,7 @@ from nova.tests import uuidsentinel as uuids
FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
def compute_api_get(self, context, instance_id, expected_attrs=None,
want_objects=False):
def compute_api_get(self, context, instance_id, expected_attrs=None):
return dict(uuid=FAKE_UUID, id=instance_id, instance_type_id=1, host='bob')
@@ -93,8 +92,7 @@ class ServerVirtualInterfaceTestV21(test.NoDBTestCase):
fake_req.api_version_request = api_version_request.APIVersionRequest(
self.wsgi_api_version)
compute_api.API.get(fake_context, 'fake_uuid',
expected_attrs=None,
want_objects=True).AndRaise(
expected_attrs=None).AndRaise(
exception.InstanceNotFound(instance_id='instance-0000'))
self.mox.ReplayAll()

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

@@ -50,8 +50,7 @@ FAKE_UUID_C = 'cccccccc-cccc-cccc-cccc-cccccccccccc'
IMAGE_UUID = 'c905cedb-7281-47e4-8a62-f26bc5fc4c77'
def fake_get_instance(self, context, instance_id, want_objects=False,
expected_attrs=None):
def fake_get_instance(self, context, instance_id, expected_attrs=None):
return fake_instance.fake_instance_obj(context, **{'uuid': instance_id})

6
nova/tests/unit/api/openstack/fakes.py
View File

@@ -329,8 +329,7 @@ def fake_instance_get(**kwargs):
def fake_compute_get(**kwargs):
def _return_server_obj(context, uuid, want_objects=False,
expected_attrs=None):
def _return_server_obj(context, uuid, expected_attrs=None):
return stub_instance_obj(context, **kwargs)
return _return_server_obj
@@ -380,8 +379,7 @@ def fake_instance_get_all_by_filters(num_servers=5, **kwargs):
def fake_compute_get_all(num_servers=5, **kwargs):
def _return_servers_objs(context, search_opts=None, limit=None,
marker=None, want_objects=False,
expected_attrs=None, sort_keys=None,
marker=None, expected_attrs=None, sort_keys=None,
sort_dirs=None):
db_insts = fake_instance_get_all_by_filters()(None,
limit=limit,

15
nova/tests/unit/compute/test_compute.py
View File

@@ -8115,16 +8115,14 @@ class ComputeAPITestCase(BaseTestCase):
def test_get(self):
# Test get instance.
exp_instance = self._create_fake_instance_obj()
instance = self.compute_api.get(self.context, exp_instance.uuid,
want_objects=True)
instance = self.compute_api.get(self.context, exp_instance.uuid)
self.assertEqual(exp_instance.id, instance.id)
def test_get_with_admin_context(self):
# Test get instance.
c = context.get_admin_context()
exp_instance = self._create_fake_instance_obj()
instance = self.compute_api.get(c, exp_instance['uuid'],
want_objects=True)
instance = self.compute_api.get(c, exp_instance['uuid'])
self.assertEqual(exp_instance.id, instance.id)
def test_get_all_by_name_regexp(self):
@@ -9867,16 +9865,14 @@ class ComputeAPITestCase(BaseTestCase):
instance = self._create_fake_instance_obj(params={'host': CONF.host})
self.compute.build_and_run_instance(self.context,
instance, {}, {}, {}, block_device_mapping=[])
instance = self.compute_api.get(self.context, instance['uuid'],
want_objects=True)
instance = self.compute_api.get(self.context, instance['uuid'])
self.compute_api.inject_network_info(self.context, instance)
def test_reset_network(self):
instance = self._create_fake_instance_obj()
self.compute.build_and_run_instance(self.context,
instance, {}, {}, {}, block_device_mapping=[])
instance = self.compute_api.get(self.context, instance['uuid'],
want_objects=True)
instance = self.compute_api.get(self.context, instance['uuid'])
self.compute_api.reset_network(self.context, instance)
def test_lock(self):
@@ -9896,8 +9892,7 @@ class ComputeAPITestCase(BaseTestCase):
self.compute.build_and_run_instance(self.context,
instance, {}, {}, {}, block_device_mapping=[])
instance = self.compute_api.get(self.context, instance.uuid,
want_objects=True)
instance = self.compute_api.get(self.context, instance.uuid)
security_group_name = self._create_group()['name']
self.security_group_api.add_to_instance(self.context,

10
nova/tests/unit/compute/test_compute_api.py
View File

@@ -3516,18 +3516,10 @@ class _ComputeAPIUnitTestMixIn(object):
def test_metadata_invalid_return_empty_object(self):
api = compute_api.API()
ret = api.get_all(self.context, want_objects=True,
search_opts={'metadata': 'foo'})
ret = api.get_all(self.context, search_opts={'metadata': 'foo'})
self.assertIsInstance(ret, objects.InstanceList)
self.assertEqual(0, len(ret))
def test_metadata_invalid_return_empty_list(self):
api = compute_api.API()
ret = api.get_all(self.context, want_objects=False,
search_opts={'metadata': 'foo'})
self.assertIsInstance(ret, list)
self.assertEqual(0, len(ret))
def test_populate_instance_names_host_name(self):
params = dict(display_name="vm1")
instance = self._create_instance_obj(params=params)