openstack
/
nova
Code Issues Proposed changes

Fix api direct use of instance module objects 

This switches the nova/api and nova/tests/api code to use
nova.objects.Instance* vs nova.objects.instance.Instance*.

Partial-Blueprint: object-subclassing

Change-Id: I146f1d082fa37e1a5c09aa8c5363746daffbc219
This commit is contained in:
Chris Behrens 2014-05-17 13:21:46 -07:00
parent 3c1085f528
commit a9f54de277
42 changed files with 153 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nova/api/ec2/cloud.py
View File

@ -45,7 +45,6 @@ from nova import objects
from nova.objects import base as obj_base
from nova.objects import ec2 as ec2_obj
from nova.objects import flavor as flavor_obj
from nova.objects import instance as instance_obj
from nova.objects import security_group as sec_group_obj
from nova.objects import service as service_obj
from nova.openstack.common.gettextutils import _
@ -801,8 +800,7 @@ class CloudController(object):
if volume.get('instance_uuid', None):
instance_uuid = volume['instance_uuid']
# Make sure instance exists
instance_obj.Instance.get_by_uuid(context.elevated(),
instance_uuid)
objects.Instance.get_by_uuid(context.elevated(), instance_uuid)
instance_ec2_id = ec2utils.id_to_ec2_inst_id(instance_uuid)
@ -900,7 +898,7 @@ class CloudController(object):
if volume.get('instance_uuid'):
try:
inst_uuid = volume['instance_uuid']
return instance_obj.Instance.get_by_uuid(context, inst_uuid)
return objects.Instance.get_by_uuid(context, inst_uuid)
except exception.InstanceNotFound:
pass
raise exception.VolumeUnattached(volume_id=volume['id'])
@ -1362,7 +1360,7 @@ class CloudController(object):
if client_token:
for ec2_id in instance_ids:
instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, ec2_id)
instance = instance_obj.Instance.get_by_uuid(context,
instance = objects.Instance.get_by_uuid(context,
instance_uuid, expected_attrs=['system_metadata'])
instance.system_metadata.update(
{'EC2_client_token': client_token})
@ -1370,7 +1368,7 @@ class CloudController(object):
def _get_client_token(self, context, instance_uuid):
"""Get client token for a given instance."""
instance = instance_obj.Instance.get_by_uuid(context,
instance = objects.Instance.get_by_uuid(context,
instance_uuid, expected_attrs=['system_metadata'])
return instance.system_metadata.get('EC2_client_token')
@ -1379,7 +1377,7 @@ class CloudController(object):
for ec2_id in instance_ids:
instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, ec2_id)
instance = instance_obj.Instance.get_by_uuid(context,
instance = objects.Instance.get_by_uuid(context,
instance_uuid, expected_attrs=['system_metadata'])
instance.system_metadata.pop('EC2_client_token', None)
instance.save()
@ -1393,24 +1391,21 @@ class CloudController(object):
for sys_meta in sys_metas:
if sys_meta and sys_meta.get('value') == client_token:
instance = instance_obj.Instance.get_by_uuid(
instance = objects.Instance.get_by_uuid(
context, sys_meta['instance_id'], expected_attrs=None)
resv_id = instance.get('reservation_id')
break
return resv_id
def _ec2_ids_to_instances(self, context, instance_id, objects=False):
def _ec2_ids_to_instances(self, context, instance_id):
"""Get all instances first, to prevent partial executions."""
instances = []
extra = ['system_metadata', 'metadata', 'info_cache']
for ec2_id in instance_id:
validate_ec2_id(ec2_id)
instance_uuid = ec2utils.ec2_inst_id_to_uuid(context, ec2_id)
if objects:
instance = instance_obj.Instance.get_by_uuid(
instance = objects.Instance.get_by_uuid(
context, instance_uuid, expected_attrs=extra)
else:
instance = self.compute_api.get(context, instance_uuid)
instances.append(instance)
return instances
@ -1418,8 +1413,7 @@ class CloudController(object):
"""Terminate each instance in instance_id, which is a list of ec2 ids.
instance_id is a kwarg so its name cannot be modified.
"""
previous_states = self._ec2_ids_to_instances(context, instance_id,
objects=True)
previous_states = self._ec2_ids_to_instances(context, instance_id)
self._remove_client_token(context, instance_id)
LOG.debug("Going to start terminating instances")
for instance in previous_states:
@ -1430,8 +1424,7 @@ class CloudController(object):
def reboot_instances(self, context, instance_id, **kwargs):
"""instance_id is a list of instance ids."""
instances = self._ec2_ids_to_instances(context, instance_id,
objects=True)
instances = self._ec2_ids_to_instances(context, instance_id)
LOG.audit(_("Reboot instance %r"), instance_id, context=context)
for instance in instances:
self.compute_api.reboot(context, instance, 'HARD')
@ -1441,7 +1434,7 @@ class CloudController(object):
"""Stop each instances in instance_id.
Here instance_id is a list of instance ids
"""
instances = self._ec2_ids_to_instances(context, instance_id, True)
instances = self._ec2_ids_to_instances(context, instance_id)
LOG.debug("Going to stop instances")
for instance in instances:
extensions.check_compute_policy(context, 'stop', instance)
@ -1452,7 +1445,7 @@ class CloudController(object):
"""Start each instances in instance_id.
Here instance_id is a list of instance ids
"""
instances = self._ec2_ids_to_instances(context, instance_id, True)
instances = self._ec2_ids_to_instances(context, instance_id)
LOG.debug("Going to start instances")
for instance in instances:
extensions.check_compute_policy(context, 'start', instance)

4
nova/api/ec2/ec2utils.py
View File

@ -22,8 +22,8 @@ from nova import context
from nova import db
from nova import exception
from nova.network import model as network_model
from nova.objects import base as obj_base
from nova.objects import ec2 as ec2_obj
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.openstack.common import memorycache
@ -160,7 +160,7 @@ def get_ip_info_for_instance_from_nw_info(nw_info):
def get_ip_info_for_instance(context, instance):
"""Return a dictionary of IP information for an instance."""
if isinstance(instance, instance_obj.Instance):
if isinstance(instance, obj_base.NovaObject):
nw_info = instance.info_cache.network_info
else:
# FIXME(comstud): Temporary as we transition to objects.

9
nova/api/metadata/base.py
View File

@ -32,7 +32,6 @@ from nova import context
from nova import network
from nova import objects
from nova.objects import base as obj_base
from nova.objects import instance as instance_obj
from nova.objects import security_group as secgroup_obj
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
@ -116,12 +115,12 @@ class InstanceMetadata():
ctxt = context.get_admin_context()
# NOTE(danms): This should be removed after bp:compute-manager-objects
if not isinstance(instance, instance_obj.Instance):
if not isinstance(instance, obj_base.NovaObject):
expected = ['metadata', 'system_metadata']
if 'info_cache' in instance:
expected.append('info_cache')
instance = instance_obj.Instance._from_db_object(
ctxt, instance_obj.Instance(), instance,
instance = objects.Instance._from_db_object(
ctxt, objects.Instance(), instance,
expected_attrs=expected)
# The default value of mimeType is set to MIME_TYPE_TEXT_PLAIN
@ -519,7 +518,7 @@ def get_metadata_by_address(conductor_api, address):
def get_metadata_by_instance_id(conductor_api, instance_id, address,
ctxt=None):
ctxt = ctxt or context.get_admin_context()
instance = instance_obj.Instance.get_by_uuid(ctxt, instance_id)
instance = objects.Instance.get_by_uuid(ctxt, instance_id)
return InstanceMetadata(instance, address)

4
nova/api/openstack/compute/contrib/server_external_events.py
View File

@ -19,8 +19,8 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
from nova import compute
from nova import exception
from nova import objects
from nova.objects import external_event as external_event_obj
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
@ -104,7 +104,7 @@ class ServerExternalEventsController(wsgi.Controller):
events.append(_event)
if event.instance_uuid not in instances:
try:
instance = instance_obj.Instance.get_by_uuid(
instance = objects.Instance.get_by_uuid(
context, event.instance_uuid)
instances[event.instance_uuid] = instance
except exception.InstanceNotFound:

4
nova/api/openstack/compute/contrib/server_groups.py
View File

@ -23,7 +23,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
import nova.exception
from nova.objects import instance as instance_obj
from nova import objects
from nova.objects import instance_group as instance_group_obj
from nova.openstack.common.gettextutils import _
from nova import utils
@ -157,7 +157,7 @@ class ServerGroupController(wsgi.Controller):
if group.members:
# Display the instances that are not deleted.
filters = {'uuid': group.members, 'deleted': False}
instances = instance_obj.InstanceList.get_by_filters(
instances = objects.InstanceList.get_by_filters(
context, filters=filters)
members = [instance.uuid for instance in instances]
server_group['members'] = members

6
nova/api/openstack/compute/contrib/server_start_stop.py
View File

@ -18,7 +18,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova import compute
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
@ -34,8 +34,8 @@ class ServerStartStopActionController(wsgi.Controller):
def _get_instance(self, context, instance_uuid):
try:
attrs = ['system_metadata', 'metadata']
return instance_obj.Instance.get_by_uuid(context, instance_uuid,
expected_attrs=attrs)
return objects.Instance.get_by_uuid(context, instance_uuid,
expected_attrs=attrs)
except exception.NotFound:
msg = _("Instance not found")
raise webob.exc.HTTPNotFound(explanation=msg)

3
nova/api/openstack/compute/contrib/simple_tenant_usage.py
View File

@ -23,6 +23,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
from nova import exception
from nova import objects
from nova.objects import flavor as flavor_obj
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
@ -132,7 +133,7 @@ class SimpleTenantUsageController(object):
def _tenant_usages_for_period(self, context, period_start,
period_stop, tenant_id=None, detailed=True):
instances = instance_obj.InstanceList.get_active_by_window_joined(
instances = objects.InstanceList.get_active_by_window_joined(
context, period_start, period_stop, tenant_id,
expected_attrs=instance_obj.INSTANCE_DEFAULT_FIELDS)
rval = {}

4
nova/api/openstack/compute/plugins/v3/server_external_events.py
View File

@ -18,8 +18,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova import compute
from nova import exception
from nova import objects
from nova.objects import external_event as external_event_obj
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
@ -77,7 +77,7 @@ class ServerExternalEventsController(wsgi.Controller):
events.append(_event)
if event.instance_uuid not in instances:
try:
instance = instance_obj.Instance.get_by_uuid(
instance = objects.Instance.get_by_uuid(
context, event.instance_uuid)
instances[event.instance_uuid] = instance
except exception.InstanceNotFound:

7
nova/api/openstack/compute/plugins/v3/servers.py
View File

@ -33,7 +33,6 @@ from nova.compute import flavors
from nova import exception
from nova.image import glance
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.openstack.common import strutils
@ -284,7 +283,7 @@ class ServersController(wsgi.Controller):
log_msg = _("Flavor '%s' could not be found ")
LOG.debug(log_msg, search_opts['flavor'])
# TODO(mriedem): Move to ObjectListBase.__init__ for empty lists.
instance_list = instance_obj.InstanceList(objects=[])
instance_list = objects.InstanceList(objects=[])
if is_detail:
instance_list.fill_faults()
@ -958,8 +957,8 @@ class ServersController(wsgi.Controller):
def _get_instance(self, context, instance_uuid):
try:
attrs = ['system_metadata', 'metadata']
return instance_obj.Instance.get_by_uuid(context, instance_uuid,
expected_attrs=attrs)
return objects.Instance.get_by_uuid(context, instance_uuid,
expected_attrs=attrs)
except exception.InstanceNotFound as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())

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

@ -34,7 +34,6 @@ from nova import compute
from nova.compute import flavors
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.openstack.common import strutils
@ -607,7 +606,7 @@ class Controller(wsgi.Controller):
log_msg = _("Flavor '%s' could not be found ")
LOG.debug(log_msg, search_opts['flavor'])
# TODO(mriedem): Move to ObjectListBase.__init__ for empty lists.
instance_list = instance_obj.InstanceList(objects=[])
instance_list = objects.InstanceList(objects=[])
if is_detail:
instance_list.fill_faults()

4
nova/api/openstack/compute/views/servers.py
View File

@ -21,7 +21,7 @@ from nova.api.openstack.compute.views import addresses as views_addresses
from nova.api.openstack.compute.views import flavors as views_flavors
from nova.api.openstack.compute.views import images as views_images
from nova.compute import flavors
from nova.objects import instance as instance_obj
from nova.objects import base as obj_base
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
@ -148,7 +148,7 @@ class ViewBuilder(common.ViewBuilder):
def _get_metadata(instance):
# FIXME(danms): Transitional support for objects
metadata = instance.get('metadata')
if isinstance(instance, instance_obj.Instance):
if isinstance(instance, obj_base.NovaObject):
return metadata or {}
else:
return utils.instance_meta(instance)

5
nova/tests/api/ec2/test_cinder_cloud.py
View File

@ -30,7 +30,7 @@ from nova.compute import utils as compute_utils
from nova import context
from nova import db
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova import test
from nova.tests import cast_as_call
from nova.tests import fake_network
@ -898,8 +898,7 @@ class CinderCloudTestCase(test.TestCase):
vol = self.volume_api.get(self.context, vol2_uuid)
self._assert_volume_detached(vol)
inst_obj = instance_obj.Instance.get_by_uuid(self.context,
instance_uuid)
inst_obj = objects.Instance.get_by_uuid(self.context, instance_uuid)
self.cloud.compute_api.attach_volume(self.context,
inst_obj,
volume_id=vol2_uuid,

11
nova/tests/api/ec2/test_cloud.py
View File

@ -47,7 +47,8 @@ from nova.network import api as network_api
from nova.network import base_api as base_network_api
from nova.network import model
from nova.network import neutronv2
from nova.objects import instance as instance_obj
from nova import objects
from nova.objects import base as obj_base
from nova.objects import instance_info_cache as instance_info_cache_obj
from nova.objects import security_group as security_group_obj
from nova.openstack.common import log as logging
@ -123,7 +124,7 @@ def get_instances_with_cached_ips(orig_func, get_floating,
else:
info_cache = {'network_info': get_fake_cache(get_floating)}
if isinstance(instances, (list, instance_obj.InstanceList)):
if isinstance(instances, (list, obj_base.ObjectListBase)):
for instance in instances:
instance['info_cache'] = info_cache
else:
@ -1381,7 +1382,7 @@ class CloudTestCase(test.TestCase):
def test_describe_instances_booting_from_a_volume(self):
sys_meta = flavors.save_flavor_info(
{}, flavors.get_flavor(1))
inst = instance_obj.Instance()
inst = objects.Instance(self.context)
inst.reservation_id = 'a'
inst.image_ref = ''
inst.root_device_name = '/dev/sdh'
@ -1389,7 +1390,7 @@ class CloudTestCase(test.TestCase):
inst.vm_state = vm_states.ACTIVE
inst.host = 'host1'
inst.system_metadata = sys_meta
inst.create(self.context)
inst.create()
result = self.cloud.describe_instances(self.context)
result = result['reservationSet'][0]
instance = result['instancesSet'][0]
@ -2667,7 +2668,7 @@ class CloudTestCase(test.TestCase):
security_group_obj.SecurityGroup(name='fake0'))
secgroups.objects.append(
security_group_obj.SecurityGroup(name='fake1'))
instance = instance_obj.Instance()
instance = objects.Instance(ctxt)
instance.id = 0
instance.uuid = 'e5fe5518-0288-4fa3-b0c4-c79764101b85'
instance.root_device_name = '/dev/sdh'

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

@ -19,7 +19,7 @@ from nova.api.openstack.compute.contrib import admin_actions
from nova.compute import vm_states
import nova.context
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common import jsonutils
from nova.openstack.common import timeutils
from nova.openstack.common import uuidutils
@ -63,8 +63,8 @@ class CommonMixin(object):
instance = fake_instance.fake_db_instance(
id=1, uuid=uuid, vm_state=vm_states.ACTIVE,
task_state=None, launched_at=timeutils.utcnow())
instance = instance_obj.Instance._from_db_object(
self.context, instance_obj.Instance(), instance)
instance = objects.Instance._from_db_object(
self.context, objects.Instance(), instance)
self.compute_api.get(self.context, uuid,
want_objects=True).AndReturn(instance)
return instance
@ -608,7 +608,7 @@ class ResetStateTests(test.NoDBTestCase):
{"os-resetState": {"state": "active"}})
def _setup_mock(self, expected):
instance = instance_obj.Instance()
instance = objects.Instance()
instance.uuid = self.uuid
instance.vm_state = 'fake'
instance.task_state = 'fake'

3
nova/tests/api/openstack/compute/contrib/test_extended_availability_zone.py
View File

@ -22,6 +22,7 @@ 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
from nova.openstack.common import jsonutils
from nova import test
@ -61,7 +62,7 @@ def fake_compute_get_all(*args, **kwargs):
db_list = [inst1, inst2]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/contrib/test_extended_ips.py
View File

@ -19,6 +19,7 @@ import webob
from nova.api.openstack.compute.contrib import extended_ips
from nova.api.openstack import xmlutil
from nova import compute
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -101,7 +102,7 @@ def fake_compute_get_all(*args, **kwargs):
]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/contrib/test_extended_ips_mac.py
View File

@ -19,6 +19,7 @@ import webob
from nova.api.openstack.compute.contrib import extended_ips_mac
from nova.api.openstack import xmlutil
from nova import compute
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -106,7 +107,7 @@ def fake_compute_get_all(*args, **kwargs):
]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

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

@ -20,6 +20,7 @@ from nova.api.openstack.compute.contrib import extended_server_attributes
from nova import compute
from nova import db
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -36,8 +37,8 @@ UUID3 = '00000000-0000-0000-0000-000000000003'
def fake_compute_get(*args, **kwargs):
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj.Instance._from_db_object(
args[1], instance_obj.Instance(),
return objects.Instance._from_db_object(
args[1], objects.Instance(),
fakes.stub_instance(1, uuid=UUID3, host="host-fake",
node="node-fake"), fields)
@ -49,7 +50,7 @@ def fake_compute_get_all(*args, **kwargs):
]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/contrib/test_extended_status.py
View File

@ -20,6 +20,7 @@ from nova.api.openstack.compute.contrib import extended_status
from nova import compute
from nova import db
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -47,7 +48,7 @@ def fake_compute_get_all(*args, **kwargs):
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/contrib/test_extended_volumes.py
View File

@ -19,6 +19,7 @@ import webob
from nova.api.openstack.compute.contrib import extended_volumes
from nova import compute
from nova import db
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -40,7 +41,7 @@ def fake_compute_get_all(*args, **kwargs):
db_list = [fakes.stub_instance(1), fakes.stub_instance(2)]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/contrib/test_hide_server_addresses.py
View File

@ -23,6 +23,7 @@ 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
from nova.openstack.common import jsonutils
from nova import test
@ -114,7 +115,7 @@ class HideServerAddressesTest(test.TestCase):
def get_all(*args, **kwargs):
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(
args[1], instance_obj.InstanceList(), instances, fields)
args[1], objects.InstanceList(), instances, fields)
self.stubs.Set(compute.api.API, 'get_all', get_all)
res = self._make_request('/v2/fake/servers/detail')

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

@ -16,7 +16,7 @@
import webob
from nova import compute
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common import jsonutils
from nova import test
from nova.tests.api.openstack import fakes
@ -40,7 +40,7 @@ def compute_api_remove_fixed_ip(self, context, instance, address):
def compute_api_get(self, context, instance_id, want_objects=False):
instance = instance_obj.Instance()
instance = objects.Instance()
instance.uuid = instance_id
instance.id = 1
instance.vm_state = 'fake'

3
nova/tests/api/openstack/compute/contrib/test_security_groups.py
View File

@ -27,6 +27,7 @@ from nova.compute import power_state
from nova import context as context_maker
import nova.db
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import quota
@ -1540,7 +1541,7 @@ def fake_compute_get_all(*args, **kwargs):
]
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list,
['metadata', 'system_metadata',
'security_groups', 'info_cache'])

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

@ -20,15 +20,15 @@ import webob
from nova.api.openstack.compute.contrib import server_external_events
from nova import context
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova import test
fake_instances = {
'00000000-0000-0000-0000-000000000001': instance_obj.Instance(
'00000000-0000-0000-0000-000000000001': objects.Instance(
uuid='00000000-0000-0000-0000-000000000001', host='host1'),
'00000000-0000-0000-0000-000000000002': instance_obj.Instance(
'00000000-0000-0000-0000-000000000002': objects.Instance(
uuid='00000000-0000-0000-0000-000000000002', host='host1'),
'00000000-0000-0000-0000-000000000003': instance_obj.Instance(
'00000000-0000-0000-0000-000000000003': objects.Instance(
uuid='00000000-0000-0000-0000-000000000003', host='host2'),
}
fake_instance_uuids = sorted(fake_instances.keys())

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

@ -21,7 +21,7 @@ from nova.api.openstack import wsgi
from nova import context
import nova.db
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova.objects import instance_group as instance_group_obj
from nova.openstack.common import uuidutils
from nova import test
@ -107,7 +107,7 @@ class ServerGroupTest(test.TestCase):
self.assertEqual(res_dict['server_group']['policies'], policies)
def _create_instance(self, context):
instance = instance_obj.Instance(image_ref=1, node='node1',
instance = objects.Instance(image_ref=1, node='node1',
reservation_id='a', host='host1', project_id='fake',
vm_state='fake', system_metadata={'key': 'value'})
instance.create(context)
@ -145,7 +145,7 @@ class ServerGroupTest(test.TestCase):
instances[1].destroy(ctx)
# check that the instance does not exist
self.assertRaises(exception.InstanceNotFound,
instance_obj.Instance.get_by_uuid,
objects.Instance.get_by_uuid,
ctx, instances[1].uuid)
res_dict = self.controller.show(req, ig_uuid)
result_members = res_dict['server_group']['members']

3
nova/tests/api/openstack/compute/contrib/test_server_usage.py
View File

@ -21,6 +21,7 @@ from nova.api.openstack.compute.contrib import server_usage
from nova import compute
from nova import db
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova.openstack.common import timeutils
@ -52,7 +53,7 @@ def fake_compute_get_all(*args, **kwargs):
]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

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

@ -24,8 +24,8 @@ from nova.compute import flavors
from nova.compute import vm_states
from nova import context
from nova import db
from nova import objects
from nova.objects import flavor as flavor_obj
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova.openstack.common import policy as common_policy
from nova.openstack.common import timeutils
@ -436,8 +436,8 @@ class SimpleTenantUsageControllerTest(test.TestCase):
tenant_id=self.context.project_id,
vm_state=vm_states.DELETED)
# convert the fake instance dict to an object
self.inst_obj = instance_obj.Instance._from_db_object(
self.context, instance_obj.Instance(), self.baseinst)
self.inst_obj = objects.Instance._from_db_object(
self.context, objects.Instance(), self.baseinst)
def test_get_flavor_from_sys_meta(self):
# Non-deleted instances get their type information from their

8
nova/tests/api/openstack/compute/plugins/v3/test_admin_actions.py
View File

@ -18,7 +18,7 @@ from nova.api.openstack.compute.plugins.v3 import admin_actions
from nova.compute import vm_states
import nova.context
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common import jsonutils
from nova.openstack.common import timeutils
from nova.openstack.common import uuidutils
@ -58,8 +58,8 @@ class CommonMixin(object):
instance = fake_instance.fake_db_instance(
id=1, uuid=uuid, vm_state=vm_states.ACTIVE,
task_state=None, launched_at=timeutils.utcnow())
instance = instance_obj.Instance._from_db_object(
self.context, instance_obj.Instance(), instance)
instance = objects.Instance._from_db_object(
self.context, objects.Instance(), instance)
self.compute_api.get(self.context, uuid, expected_attrs=None,
want_objects=True).AndReturn(instance)
return instance
@ -221,7 +221,7 @@ class ResetStateTests(test.NoDBTestCase):
{"reset_state": {"state": "active"}})
def _setup_mock(self, expected):
instance = instance_obj.Instance()
instance = objects.Instance()
instance.uuid = self.uuid
instance.vm_state = 'fake'
instance.task_state = 'fake'

3
nova/tests/api/openstack/compute/plugins/v3/test_extended_availability_zone.py
View File

@ -21,6 +21,7 @@ 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
from nova.openstack.common import jsonutils
from nova import test
@ -60,7 +61,7 @@ def fake_compute_get_all(*args, **kwargs):
db_list = [inst1, inst2]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/plugins/v3/test_extended_server_attributes.py
View File

@ -19,6 +19,7 @@ from nova.api.openstack.compute.plugins.v3 import extended_server_attributes
from nova import compute
from nova import db
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -48,7 +49,7 @@ def fake_compute_get_all(*args, **kwargs):
]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/plugins/v3/test_extended_status.py
View File

@ -18,6 +18,7 @@ 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
from nova.openstack.common import jsonutils
from nova import test
@ -44,7 +45,7 @@ def fake_compute_get_all(*args, **kwargs):
]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/plugins/v3/test_extended_volumes.py
View File

@ -21,6 +21,7 @@ from nova import compute
from nova import context
from nova import db
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -47,7 +48,7 @@ def fake_compute_get_all(*args, **kwargs):
db_list = [fakes.stub_instance(1), fakes.stub_instance(2)]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

3
nova/tests/api/openstack/compute/plugins/v3/test_hide_server_addresses.py
View File

@ -21,6 +21,7 @@ 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
from nova.openstack.common import jsonutils
from nova import test
@ -109,7 +110,7 @@ class HideServerAddressesTest(test.TestCase):
def get_all(*args, **kwargs):
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(
args[1], instance_obj.InstanceList(), instances, fields)
args[1], objects.InstanceList(), instances, fields)
self.stubs.Set(compute.api.API, 'get_all', get_all)
res = self._make_request('/v3/servers/detail')

3
nova/tests/api/openstack/compute/plugins/v3/test_security_groups.py
View File

@ -27,6 +27,7 @@ from nova.compute import flavors
from nova import db
from nova import exception
from nova.network import manager
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova import test
@ -69,7 +70,7 @@ def fake_compute_get_all(*args, **kwargs):
]
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list,
['metadata', 'system_metadata',
'security_groups', 'info_cache'])

8
nova/tests/api/openstack/compute/plugins/v3/test_server_actions.py
View File

@ -28,7 +28,7 @@ from nova import context
from nova import db
from nova import exception
from nova.image import glance
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
from nova.openstack.common import uuidutils
@ -120,8 +120,8 @@ class ServerActionsControllerTest(test.TestCase):
uuid = uuidutils.generate_uuid()
instance = fake_instance.fake_db_instance(
id=1, uuid=uuid, vm_state=vm_states.ACTIVE, task_state=None)
instance = instance_obj.Instance._from_db_object(
self.context, instance_obj.Instance(), instance)
instance = objects.Instance._from_db_object(
self.context, objects.Instance(), instance)
self.compute_api.get(self.context, uuid, want_objects=True,
expected_attrs=['pci_devices']).AndReturn(instance)
@ -554,7 +554,7 @@ class ServerActionsControllerTest(test.TestCase):
self.stubs.Set(fake._FakeImageService, 'show', return_image_meta)
self.stubs.Set(compute_api.API, 'get', wrap_get)
self.stubs.Set(instance_obj.Instance, 'save', fake_save)
self.stubs.Set(objects.Instance, 'save', fake_save)
body = {
"rebuild": {
"image_ref": "155d900f-4e14-4e4c-a73d-069cbf4541e6",

8
nova/tests/api/openstack/compute/plugins/v3/test_server_external_events.py
View File

@ -20,15 +20,15 @@ import webob
from nova.api.openstack.compute.plugins.v3 import server_external_events
from nova import context
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova import test
fake_instances = {
'00000000-0000-0000-0000-000000000001': instance_obj.Instance(
'00000000-0000-0000-0000-000000000001': objects.Instance(
uuid='00000000-0000-0000-0000-000000000001', host='host1'),
'00000000-0000-0000-0000-000000000002': instance_obj.Instance(
'00000000-0000-0000-0000-000000000002': objects.Instance(
uuid='00000000-0000-0000-0000-000000000002', host='host1'),
'00000000-0000-0000-0000-000000000003': instance_obj.Instance(
'00000000-0000-0000-0000-000000000003': objects.Instance(
uuid='00000000-0000-0000-0000-000000000003', host='host2'),
}
fake_instance_uuids = sorted(fake_instances.keys())

12
nova/tests/api/openstack/compute/plugins/v3/test_server_metadata.py
View File

@ -24,7 +24,7 @@ from nova.compute import rpcapi as compute_rpcapi
from nova.compute import vm_states
import nova.db
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common import jsonutils
from nova.openstack.common import timeutils
from nova import test
@ -209,7 +209,7 @@ class ServerMetaDataTest(BaseTest):
def test_create(self):
self.stubs.Set(nova.db, 'instance_metadata_get',
return_server_metadata)
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'POST'
req.content_type = "application/json"
@ -285,7 +285,7 @@ class ServerMetaDataTest(BaseTest):
self.controller.create, req, self.uuid, body)
def test_update_metadata(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'POST'
req.content_type = 'application/json'
@ -300,7 +300,7 @@ class ServerMetaDataTest(BaseTest):
self.assertEqual(expected, response)
def test_update_all(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'PUT'
req.content_type = "application/json"
@ -316,7 +316,7 @@ class ServerMetaDataTest(BaseTest):
self.assertEqual(expected, res_dict)
def test_update_all_empty_container(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'PUT'
req.content_type = "application/json"
@ -362,7 +362,7 @@ class ServerMetaDataTest(BaseTest):
self.controller.update_all, req, '100', body)
def test_update_item(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequestV3.blank(self.url + '/key1')
req.method = 'PUT'
body = {"metadata": {"key1": "value1"}}

3
nova/tests/api/openstack/compute/plugins/v3/test_server_usage.py
View File

@ -18,6 +18,7 @@ import datetime
from nova import compute
from nova import db
from nova import exception
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common import jsonutils
from nova.openstack.common import timeutils
@ -49,7 +50,7 @@ def fake_compute_get_all(*args, **kwargs):
]
fields = instance_obj.INSTANCE_DEFAULT_FIELDS
return instance_obj._make_instance_list(args[1],
instance_obj.InstanceList(),
objects.InstanceList(),
db_list, fields)

27
nova/tests/api/openstack/compute/plugins/v3/test_servers.py
View File

@ -44,6 +44,7 @@ from nova import exception
from nova.image import glance
from nova.network import manager
from nova.network.neutronv2 import api as neutron_api
from nova import objects
from nova.objects import instance as instance_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import jsonutils
@ -653,7 +654,7 @@ class ServersControllerTest(ControllerTest):
expected_attrs=[]):
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -675,7 +676,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['image'], '12345')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -906,7 +907,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['flavor'], '12345')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -940,7 +941,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['vm_state'], [vm_states.ACTIVE])
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -967,7 +968,7 @@ class ServersControllerTest(ControllerTest):
db_list = [fakes.stub_instance(100, uuid=server_uuid,
task_state=task_state)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -991,7 +992,7 @@ class ServersControllerTest(ControllerTest):
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1026,7 +1027,7 @@ class ServersControllerTest(ControllerTest):
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1049,7 +1050,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['name'], 'whee.*')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1074,7 +1075,7 @@ class ServersControllerTest(ControllerTest):
self.assertNotIn('deleted', search_opts)
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1111,7 +1112,7 @@ class ServersControllerTest(ControllerTest):
self.assertNotIn('unknown_option', search_opts)
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1143,7 +1144,7 @@ class ServersControllerTest(ControllerTest):
self.assertIn('unknown_option', search_opts)
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1169,7 +1170,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['ip'], '10\..*')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1194,7 +1195,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['ip6'], 'ffff.*')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)

10
nova/tests/api/openstack/compute/test_server_actions.py
View File

@ -28,7 +28,7 @@ from nova import context
from nova import db
from nova import exception
from nova.image import glance
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
from nova.openstack.common import uuidutils
@ -124,8 +124,8 @@ class ServerActionsControllerTest(test.TestCase):
uuid = uuidutils.generate_uuid()
instance = fake_instance.fake_db_instance(
id=1, uuid=uuid, vm_state=vm_states.ACTIVE, task_state=None)
instance = instance_obj.Instance._from_db_object(
self.context, instance_obj.Instance(), instance)
instance = objects.Instance._from_db_object(
self.context, objects.Instance(), instance)
self.compute_api.get(self.context, uuid,
want_objects=True).AndReturn(instance)
@ -682,7 +682,7 @@ class ServerActionsControllerTest(test.TestCase):
data['changes'].update(data['instance'].obj_get_changes())
self.stubs.Set(compute_api.API, 'get', wrap_get)
self.stubs.Set(instance_obj.Instance, 'save', fake_save)
self.stubs.Set(objects.Instance, 'save', fake_save)
req = fakes.HTTPRequest.blank(self.url)
self.controller._action_rebuild(req, FAKE_UUID, body)
@ -757,7 +757,7 @@ class ServerActionsControllerTest(test.TestCase):
self.stubs.Set(fake._FakeImageService, 'show', return_image_meta)
self.stubs.Set(compute_api.API, 'get', wrap_get)
self.stubs.Set(instance_obj.Instance, 'save', fake_save)
self.stubs.Set(objects.Instance, 'save', fake_save)
body = {
"rebuild": {
"imageRef": "155d900f-4e14-4e4c-a73d-069cbf4541e6",

12
nova/tests/api/openstack/compute/test_server_metadata.py
View File

@ -25,7 +25,7 @@ from nova.compute import rpcapi as compute_rpcapi
from nova.compute import vm_states
import nova.db
from nova import exception
from nova.objects import instance as instance_obj
from nova import objects
from nova.openstack.common import jsonutils
from nova.openstack.common import timeutils
from nova import test
@ -208,7 +208,7 @@ class ServerMetaDataTest(BaseTest):
self.controller.delete, req, self.uuid, 'key6')
def test_create(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'POST'
req.content_type = "application/json"
@ -271,7 +271,7 @@ class ServerMetaDataTest(BaseTest):
self.controller.create, req, self.uuid, body)
def test_update_metadata(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'POST'
req.content_type = 'application/json'
@ -286,7 +286,7 @@ class ServerMetaDataTest(BaseTest):
self.assertEqual(expected, response)
def test_update_all(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'PUT'
req.content_type = "application/json"
@ -302,7 +302,7 @@ class ServerMetaDataTest(BaseTest):
self.assertEqual(expected, res_dict)
def test_update_all_empty_container(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url)
req.method = 'PUT'
req.content_type = "application/json"
@ -348,7 +348,7 @@ class ServerMetaDataTest(BaseTest):
self.controller.update_all, req, '100', body)
def test_update_item(self):
self.stubs.Set(instance_obj.Instance, 'save', fake_instance_save)
self.stubs.Set(objects.Instance, 'save', fake_instance_save)
req = fakes.HTTPRequest.blank(self.url + '/key1')
req.method = 'PUT'
body = {"meta": {"key1": "value1"}}

33
nova/tests/api/openstack/compute/test_servers.py
View File

@ -45,6 +45,7 @@ from nova import exception
from nova.image import glance
from nova.network import manager
from nova.network.neutronv2 import api as neutron_api
from nova import objects
from nova.objects import instance as instance_obj
from nova.objects import service as service_obj
from nova.openstack.common.gettextutils import _
@ -624,7 +625,7 @@ class ServersControllerTest(ControllerTest):
limit=None, marker=None, want_objects=False):
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -645,7 +646,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['image'], '12345')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -829,7 +830,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['flavor'], '12345')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -862,7 +863,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['vm_state'], [vm_states.ACTIVE])
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -888,7 +889,7 @@ class ServersControllerTest(ControllerTest):
db_list = [fakes.stub_instance(100, uuid=server_uuid,
task_state=task_state)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -911,7 +912,7 @@ class ServersControllerTest(ControllerTest):
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -945,7 +946,7 @@ class ServersControllerTest(ControllerTest):
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -967,7 +968,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['name'], 'whee.*')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -991,7 +992,7 @@ class ServersControllerTest(ControllerTest):
self.assertNotIn('deleted', search_opts)
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1027,7 +1028,7 @@ class ServersControllerTest(ControllerTest):
self.assertNotIn('unknown_option', search_opts)
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1058,7 +1059,7 @@ class ServersControllerTest(ControllerTest):
self.assertIn('unknown_option', search_opts)
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1082,7 +1083,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['ip'], '10\..*')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1106,7 +1107,7 @@ class ServersControllerTest(ControllerTest):
self.assertEqual(search_opts['ip6'], 'ffff.*')
db_list = [fakes.stub_instance(100, uuid=server_uuid)]
return instance_obj._make_instance_list(
context, instance_obj.InstanceList(), db_list, FIELDS)
context, objects.InstanceList(), db_list, FIELDS)
self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
@ -1425,7 +1426,7 @@ class ServersControllerDeleteTest(ControllerTest):
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
task_state=task_states.DELETING,
host='fake_host'))
self.stubs.Set(instance_obj.Instance, 'save',
self.stubs.Set(objects.Instance, 'save',
lambda *args, **kwargs: None)
@classmethod
@ -1446,7 +1447,7 @@ class ServersControllerDeleteTest(ControllerTest):
fakes.fake_instance_get(vm_state=vm_states.ACTIVE,
task_state=task_states.DELETING,
host='fake_host'))
self.stubs.Set(instance_obj.Instance, 'save',
self.stubs.Set(objects.Instance, 'save',
lambda *args, **kwargs: None)
@classmethod
@ -2759,7 +2760,7 @@ class ServersControllerCreateTest(test.TestCase):
self.validation_fail_instance_destroy_called = True
self.stubs.Set(compute_api.API, '_validate_bdm', _validate_bdm)
self.stubs.Set(instance_obj.Instance, 'destroy', _instance_destroy)
self.stubs.Set(objects.Instance, 'destroy', _instance_destroy)
for _ in xrange(len(bdm_exceptions)):
params = {'block_device_mapping_v2': [bdm.copy()]}