openstack/deb-nova
Code Issues Proposed changes

Remove usage of remotable context parameter in bandwidth, block_device

Browse Source 
This removes the use of the context parameter in remotable methods
in these objects. This is a precursor to actually removing the
context from the call, but we need to remove dependence on the
argument first. Remotable methods should be using the bundled object
context.

Related to blueprint kilo-objects

Change-Id: I6d4ccef9a2c59a6a082b4ce4eed03ae959eb0983
This commit is contained in:
Dan Smith
2015-03-13 09:38:44 -07:00
parent 9b7a1b89bf
commit b523173c17
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/objects/bandwidth_usage.py
View File

@@ -58,11 +58,11 @@ class BandwidthUsage(base.NovaPersistentObject, base.NovaObject,
last_ctr_out, start_period=None, last_refreshed=None,
update_cells=True):
db_bw_usage = db.bw_usage_update(
context, uuid, mac, start_period, bw_in, bw_out,
self._context, uuid, mac, start_period, bw_in, bw_out,
last_ctr_in, last_ctr_out, last_refreshed=last_refreshed,
update_cells=update_cells)
self._from_db_object(context, self, db_bw_usage)
self._from_db_object(self._context, self, db_bw_usage)
class BandwidthUsageList(base.ObjectListBase, base.NovaObject):

12
nova/objects/block_device.py
View File

@@ -141,24 +141,24 @@ class BlockDeviceMapping(base.NovaPersistentObject, base.NovaObject,
@base.remotable
def create(self, context):
self._create(context)
self._create(self._context)
@base.remotable
def update_or_create(self, context):
self._create(context, update_or_create=True)
self._create(self._context, update_or_create=True)
@base.remotable
def destroy(self, context):
if not self.obj_attr_is_set('id'):
raise exception.ObjectActionError(action='destroy',
reason='already destroyed')
db.block_device_mapping_destroy(context, self.id)
db.block_device_mapping_destroy(self._context, self.id)
delattr(self, base.get_attrname('id'))
cell_type = cells_opts.get_cell_type()
if cell_type == 'compute':
cells_api = cells_rpcapi.CellsAPI()
cells_api.bdm_destroy_at_top(context, self.instance_uuid,
cells_api.bdm_destroy_at_top(self._context, self.instance_uuid,
device_name=self.device_name,
volume_id=self.volume_id)
@@ -171,11 +171,11 @@ class BlockDeviceMapping(base.NovaPersistentObject, base.NovaObject,
updates.pop('id', None)
updated = db.block_device_mapping_update(self._context, self.id,
updates, legacy=False)
self._from_db_object(context, self, updated)
self._from_db_object(self._context, self, updated)
cell_type = cells_opts.get_cell_type()
if cell_type == 'compute':
cells_api = cells_rpcapi.CellsAPI()
cells_api.bdm_update_or_create_at_top(context, self)
cells_api.bdm_update_or_create_at_top(self._context, self)
@base.remotable_classmethod
def get_by_volume_id(cls, context, volume_id,