openstack
/
nova
Code Issues Proposed changes

Fix rest of API objects usage 

Change the rest of API to use objects.<Object> vs
objects.<module>.<Object>.

Partial-Blueprint: object-subclassing

Change-Id: I04db37c21547184f5aeb970e69547d6210be0c3e
This commit is contained in:
Chris Behrens 2014-05-19 19:02:21 -07:00
parent 91449a8286
commit 51cd3c75a6
17 changed files with 52 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,10 +43,6 @@ from nova import network
from nova.network.security_group import neutron_driver
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 security_group as sec_group_obj
from nova.objects import service as service_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
@ -280,7 +276,7 @@ class CloudController(object):
availability_zones.get_availability_zones(ctxt)
# Available services
enabled_services = service_obj.ServiceList.get_all(context,
enabled_services = objects.ServiceList.get_all(context,
disabled=False, set_zones=True)
zone_hosts = {}
host_services = {}
@ -583,7 +579,7 @@ class CloudController(object):
source_project_id = self._get_source_project_id(context,
source_security_group_owner_id)
source_security_group = sec_group_obj.SecurityGroup.get_by_name(
source_security_group = objects.SecurityGroup.get_by_name(
context.elevated(),
source_project_id,
source_security_group_name)
@ -852,7 +848,7 @@ class CloudController(object):
kwargs.get('description'),
**create_kwargs)
vmap = ec2_obj.EC2VolumeMapping(context)
vmap = objects.EC2VolumeMapping(context)
vmap.uuid = volume['id']
vmap.create()
@ -1332,9 +1328,8 @@ class CloudController(object):
msg = _('Image must be available')
raise exception.ImageNotActive(message=msg)
flavor = flavor_obj.Flavor.get_by_name(context,
kwargs.get('instance_type',
None))
flavor = objects.Flavor.get_by_name(context,
kwargs.get('instance_type', None))
(instances, resv_id) = self.compute_api.create(context,
instance_type=obj_base.obj_to_primitive(flavor),

14
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 import objects
from nova.objects import base as obj_base
from nova.objects import ec2 as ec2_obj
from nova.openstack.common.gettextutils import _
from nova.openstack.common import log as logging
from nova.openstack.common import memorycache
@ -202,7 +202,7 @@ def ec2_inst_id_to_uuid(context, ec2_id):
@memoize
def get_instance_uuid_from_int_id(context, int_id):
imap = ec2_obj.EC2InstanceMapping.get_by_id(context, int_id)
imap = objects.EC2InstanceMapping.get_by_id(context, int_id)
return imap.uuid
@ -301,10 +301,10 @@ def get_int_id_from_instance_uuid(context, instance_uuid):
if instance_uuid is None:
return
try:
imap = ec2_obj.EC2InstanceMapping.get_by_uuid(context, instance_uuid)
imap = objects.EC2InstanceMapping.get_by_uuid(context, instance_uuid)
return imap.id
except exception.NotFound:
imap = ec2_obj.EC2InstanceMapping(context)
imap = objects.EC2InstanceMapping(context)
imap.uuid = instance_uuid
imap.create()
return imap.id
@ -315,10 +315,10 @@ def get_int_id_from_volume_uuid(context, volume_uuid):
if volume_uuid is None:
return
try:
vmap = ec2_obj.EC2VolumeMapping.get_by_uuid(context, volume_uuid)
vmap = objects.EC2VolumeMapping.get_by_uuid(context, volume_uuid)
return vmap.id
except exception.NotFound:
vmap = ec2_obj.EC2VolumeMapping(context)
vmap = objects.EC2VolumeMapping(context)
vmap.uuid = volume_uuid
vmap.create()
return vmap.id
@ -326,7 +326,7 @@ def get_int_id_from_volume_uuid(context, volume_uuid):
@memoize
def get_volume_uuid_from_int_id(context, int_id):
vmap = ec2_obj.EC2VolumeMapping.get_by_id(context, int_id)
vmap = objects.EC2VolumeMapping.get_by_id(context, int_id)
return vmap.uuid

3
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 security_group as secgroup_obj
from nova.openstack.common import importutils
from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
@ -136,7 +135,7 @@ class InstanceMetadata():
self.availability_zone = ec2utils.get_availability_zone_by_host(
instance['host'], capi)
self.security_groups = secgroup_obj.SecurityGroupList.get_by_instance(
self.security_groups = objects.SecurityGroupList.get_by_instance(
ctxt, instance)
self.mappings = _format_instance_mapping(ctxt, instance)

10
nova/api/openstack/compute/contrib/flavor_access.py
View File

@ -21,7 +21,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.objects import flavor as flavor_obj
from nova import objects
from nova.openstack.common.gettextutils import _
@ -89,7 +89,7 @@ class FlavorAccessController(object):
authorize(context)
try:
flavor = flavor_obj.Flavor.get_by_flavor_id(context, flavor_id)
flavor = objects.Flavor.get_by_flavor_id(context, flavor_id)
except exception.FlavorNotFound:
explanation = _("Flavor not found.")
raise webob.exc.HTTPNotFound(explanation=explanation)
@ -113,7 +113,7 @@ class FlavorActionController(wsgi.Controller):
def _get_flavor_refs(self, context):
"""Return a dictionary mapping flavorid to flavor_ref."""
flavors = flavor_obj.FlavorList.get_all(context)
flavors = objects.FlavorList.get_all(context)
rval = {}
for flavor in flavors:
rval[flavor.flavorid] = flavor
@ -167,7 +167,7 @@ class FlavorActionController(wsgi.Controller):
vals = body['addTenantAccess']
tenant = vals['tenant']
flavor = flavor_obj.Flavor(context=context, flavorid=id)
flavor = objects.Flavor(context=context, flavorid=id)
try:
flavor.add_access(tenant)
except exception.FlavorAccessExists as err:
@ -188,7 +188,7 @@ class FlavorActionController(wsgi.Controller):
vals = body['removeTenantAccess']
tenant = vals['tenant']
flavor = flavor_obj.Flavor(context=context, flavorid=id)
flavor = objects.Flavor(context=context, flavorid=id)
try:
flavor.remove_access(tenant)
except (exception.FlavorNotFound,

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

@ -81,7 +81,7 @@ class ServerExternalEventsController(wsgi.Controller):
for _event in body_events:
client_event = dict(_event)
event = external_event_obj.InstanceExternalEvent()
event = objects.InstanceExternalEvent(context)
try:
event.instance_uuid = client_event.pop('server_uuid')

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

@ -24,7 +24,6 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
import nova.exception
from nova import objects
from nova.objects import instance_group as instance_group_obj
from nova.openstack.common.gettextutils import _
from nova import utils
@ -209,7 +208,7 @@ class ServerGroupController(wsgi.Controller):
"""Return data about the given server group."""
context = _authorize_context(req)
try:
sg = instance_group_obj.InstanceGroup.get_by_uuid(context, id)
sg = objects.InstanceGroup.get_by_uuid(context, id)
except nova.exception.InstanceGroupNotFound as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())
return {'server_group': self._format_server_group(context, sg)}
@ -218,7 +217,7 @@ class ServerGroupController(wsgi.Controller):
"""Delete an server group."""
context = _authorize_context(req)
try:
sg = instance_group_obj.InstanceGroup.get_by_uuid(context, id)
sg = objects.InstanceGroup.get_by_uuid(context, id)
sg.destroy(context)
except nova.exception.InstanceGroupNotFound as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())
@ -230,9 +229,9 @@ class ServerGroupController(wsgi.Controller):
context = _authorize_context(req)
project_id = context.project_id
if 'all_projects' in req.GET and context.is_admin:
sgs = instance_group_obj.InstanceGroupList.get_all(context)
sgs = objects.InstanceGroupList.get_all(context)
else:
sgs = instance_group_obj.InstanceGroupList.get_by_project_id(
sgs = objects.InstanceGroupList.get_by_project_id(
context, project_id)
limited_list = common.limited(sgs.objects, req)
result = [self._format_server_group(context, group)
@ -251,13 +250,13 @@ class ServerGroupController(wsgi.Controller):
raise exc.HTTPBadRequest(explanation=e.format_message())
vals = body['server_group']
sg = instance_group_obj.InstanceGroup()
sg = objects.InstanceGroup(context)
sg.project_id = context.project_id
sg.user_id = context.user_id
try:
sg.name = vals.get('name')
sg.policies = vals.get('policies')
sg.create(context)
sg.create()
except ValueError as e:
raise exc.HTTPBadRequest(explanation=e)

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

@ -24,7 +24,6 @@ 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 _
from nova.openstack.common import timeutils
@ -129,7 +128,7 @@ class SimpleTenantUsageController(object):
return flavors_cache[flavor_type]
try:
flavor_ref = flavor_obj.Flavor.get_by_id(context, flavor_type)
flavor_ref = objects.Flavor.get_by_id(context, flavor_type)
flavors_cache[flavor_type] = flavor_ref
except exception.FlavorNotFound:
# can't bill if there is no flavor

10
nova/api/openstack/compute/plugins/v3/flavor_access.py
View File

@ -22,7 +22,7 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova.api import validation
from nova import exception
from nova.objects import flavor as flavor_obj
from nova import objects
from nova.openstack.common.gettextutils import _
ALIAS = 'flavor-access'
@ -52,7 +52,7 @@ class FlavorAccessController(object):
authorize(context)
try:
flavor = flavor_obj.Flavor.get_by_flavor_id(context, flavor_id)
flavor = objects.Flavor.get_by_flavor_id(context, flavor_id)
except exception.FlavorNotFound as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())
@ -70,7 +70,7 @@ class FlavorActionController(wsgi.Controller):
def _get_flavor_refs(self, context):
"""Return a dictionary mapping flavorid to flavor_ref."""
flavors = flavor_obj.FlavorList.get_all(context)
flavors = objects.FlavorList.get_all(context)
rval = {}
for flavor in flavors:
rval[flavor.flavorid] = flavor
@ -115,7 +115,7 @@ class FlavorActionController(wsgi.Controller):
vals = body['add_tenant_access']
tenant = vals['tenant_id']
flavor = flavor_obj.Flavor(context=context, flavorid=id)
flavor = objects.Flavor(context=context, flavorid=id)
try:
flavor.add_access(tenant)
except exception.FlavorNotFound as e:
@ -136,7 +136,7 @@ class FlavorActionController(wsgi.Controller):
vals = body['remove_tenant_access']
tenant = vals['tenant_id']
flavor = flavor_obj.Flavor(context=context, flavorid=id)
flavor = objects.Flavor(context=context, flavorid=id)
try:
flavor.remove_access(tenant)
except (exception.FlavorAccessNotFound,

6
nova/api/openstack/compute/plugins/v3/pci.py
View File

@ -20,7 +20,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 pci_device
from nova import objects
from nova.openstack.common import jsonutils
@ -103,7 +103,7 @@ class PciController(object):
compute_nodes = self.host_api.compute_node_get_all(context)
results = []
for node in compute_nodes:
pci_devs = pci_device.PciDeviceList.get_by_compute_node(
pci_devs = objects.PciDeviceList.get_by_compute_node(
context, node['id'])
results.extend([self._view_pcidevice(dev, detail)
for dev in pci_devs])
@ -119,7 +119,7 @@ class PciController(object):
context = req.environ['nova.context']
authorize(context, action='show')
try:
pci_dev = pci_device.PciDevice.get_by_dev_id(context, id)
pci_dev = objects.PciDevice.get_by_dev_id(context, id)
except exception.PciDeviceNotFoundById as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())
result = self._view_pcidevice(pci_dev, True)

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

@ -54,7 +54,7 @@ class ServerExternalEventsController(wsgi.Controller):
for _event in body_events:
client_event = dict(_event)
event = external_event_obj.InstanceExternalEvent()
event = objects.InstanceExternalEvent(context)
try:
event.instance_uuid = client_event.pop('server_uuid')

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

@ -49,8 +49,6 @@ from nova.network import model
from nova.network import neutronv2
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
from nova.openstack.common import policy as common_policy
from nova.openstack.common import timeutils
@ -119,7 +117,7 @@ def get_instances_with_cached_ips(orig_func, get_floating,
instances = orig_func(*args, **kwargs)
if kwargs.get('want_objects', False):
info_cache = instance_info_cache_obj.InstanceInfoCache()
info_cache = objects.InstanceInfoCache()
info_cache.network_info = get_fake_cache(get_floating)
info_cache.obj_reset_changes()
else:
@ -2661,11 +2659,11 @@ class CloudTestCase(test.TestCase):
inst_type = flavors.get_default_flavor()
inst_type['name'] = 'fake_type'
sys_meta = flavors.save_flavor_info({}, inst_type)
secgroups = security_group_obj.SecurityGroupList()
secgroups = objects.SecurityGroupList()
secgroups.objects.append(
security_group_obj.SecurityGroup(name='fake0'))
objects.SecurityGroup(name='fake0'))
secgroups.objects.append(
security_group_obj.SecurityGroup(name='fake1'))
objects.SecurityGroup(name='fake1'))
instance = objects.Instance(ctxt)
instance.id = 0
instance.uuid = 'e5fe5518-0288-4fa3-b0c4-c79764101b85'

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

@ -19,8 +19,8 @@ from lxml import etree
from nova.api.openstack.compute.contrib import migrations
from nova import context
from nova import exception
from nova import objects
from nova.objects import base
from nova.objects import migration
from nova.openstack.common.fixture import moxstubout
from nova import test
@ -61,8 +61,8 @@ fake_migrations = [
migrations_obj = base.obj_make_list(
'fake-context',
migration.MigrationList(),
migration.Migration,
objects.MigrationList(),
objects.Migration,
fake_migrations)

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

@ -22,7 +22,6 @@ from nova import context
import nova.db
from nova import exception
from nova import objects
from nova.objects import instance_group as instance_group_obj
from nova.openstack.common import uuidutils
from nova import test
from nova.tests.api.openstack import fakes
@ -114,7 +113,7 @@ class ServerGroupTest(test.TestCase):
return instance
def _create_instance_group(self, context, members):
ig = instance_group_obj.InstanceGroup(name='fake_name',
ig = objects.InstanceGroup(name='fake_name',
user_id='fake_user', project_id='fake',
members=members)
ig.create(context)

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

@ -26,7 +26,6 @@ from nova import context
from nova import db
from nova import exception
from nova import objects
from nova.objects import flavor as flavor_obj
from nova.openstack.common import jsonutils
from nova.openstack.common import policy as common_policy
from nova.openstack.common import timeutils
@ -461,7 +460,7 @@ class SimpleTenantUsageControllerTest(test.TestCase):
return_value=self.baseinst):
flavor = self.controller._get_flavor(self.context,
self.inst_obj, {})
self.assertEqual(flavor_obj.Flavor, type(flavor))
self.assertEqual(objects.Flavor, type(flavor))
self.assertEqual(FAKE_INST_TYPE['id'], flavor.id)
def test_get_flavor_from_non_deleted_with_id_fails(self):
@ -479,7 +478,7 @@ class SimpleTenantUsageControllerTest(test.TestCase):
self.inst_obj.system_metadata = {}
self.inst_obj.deleted = 1
flavor = self.controller._get_flavor(self.context, self.inst_obj, {})
self.assertEqual(flavor_obj.Flavor, type(flavor))
self.assertEqual(objects.Flavor, type(flavor))
self.assertEqual(FAKE_INST_TYPE['id'], flavor.id)
def test_get_flavor_from_deleted_with_id_of_deleted(self):

6
nova/tests/api/openstack/compute/plugins/v3/test_migrations.py
View File

@ -17,8 +17,8 @@ import datetime
from nova.api.openstack.compute.plugins.v3 import migrations
from nova import context
from nova import exception
from nova import objects
from nova.objects import base
from nova.objects import migration
from nova.openstack.common.fixture import moxstubout
from nova import test
@ -60,8 +60,8 @@ fake_migrations = [
migrations_obj = base.obj_make_list(
'fake-context',
migration.MigrationList(),
migration.Migration,
objects.MigrationList(),
objects.Migration,
fake_migrations)

6
nova/tests/api/openstack/compute/plugins/v3/test_pci.py
View File

@ -21,7 +21,6 @@ from nova import context
from nova import db
from nova import exception
from nova import objects
from nova.objects import pci_device as pci_device_obj
from nova.openstack.common import jsonutils
from nova.pci import pci_device
from nova import test
@ -67,7 +66,7 @@ class PciServerControllerTest(test.NoDBTestCase):
def _create_fake_instance(self):
self.inst = objects.Instance()
self.inst.uuid = 'fake-inst-uuid'
self.inst.pci_devices = pci_device_obj.PciDeviceList()
self.inst.pci_devices = objects.PciDeviceList()
def _create_fake_pci_device(self):
def fake_pci_device_get_by_addr(ctxt, id, addr):
@ -76,8 +75,7 @@ class PciServerControllerTest(test.NoDBTestCase):
ctxt = context.get_admin_context()
self.stubs.Set(db, 'pci_device_get_by_addr',
fake_pci_device_get_by_addr)
self.pci_device = pci_device_obj.PciDevice.get_by_dev_addr(
ctxt, 1, 'a')
self.pci_device = objects.PciDevice.get_by_dev_addr(ctxt, 1, 'a')
def test_show(self):
def fake_get_db_instance(id):

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

@ -48,7 +48,6 @@ 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 _
from nova.openstack.common import jsonutils
from nova.openstack.common import policy as common_policy
@ -1433,7 +1432,7 @@ class ServersControllerDeleteTest(ControllerTest):
@classmethod
def fake_get_by_compute_host(cls, context, host):
return {'updated_at': timeutils.utcnow()}
self.stubs.Set(service_obj.Service, 'get_by_compute_host',
self.stubs.Set(objects.Service, 'get_by_compute_host',
fake_get_by_compute_host)
self.controller.delete(req, FAKE_UUID)
@ -1454,7 +1453,7 @@ class ServersControllerDeleteTest(ControllerTest):
@classmethod
def fake_get_by_compute_host(cls, context, host):
return {'updated_at': datetime.datetime.min}
self.stubs.Set(service_obj.Service, 'get_by_compute_host',
self.stubs.Set(objects.Service, 'get_by_compute_host',
fake_get_by_compute_host)
self.controller.delete(req, FAKE_UUID)