openstack/nova
Code Issues Proposed changes

Merge "Refactor work with session in db.block_device_mapping_* methods"

Browse Source
This commit is contained in:
Jenkins
2013-03-13 21:53:51 +00:00
committed by Gerrit Code Review
parent 842fd5f9b8 32ceb7ae28
commit 6c96898019
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
nova/db/sqlalchemy/api.py
View File

@@ -2824,19 +2824,14 @@ def _block_device_mapping_get_query(context, session=None):
def block_device_mapping_create(context, values):
bdm_ref = models.BlockDeviceMapping()
bdm_ref.update(values)
session = get_session()
with session.begin():
bdm_ref.save(session=session)
bdm_ref.save()
@require_context
def block_device_mapping_update(context, bdm_id, values):
session = get_session()
with session.begin():
_block_device_mapping_get_query(context, session=session).\
filter_by(id=bdm_id).\
update(values)
_block_device_mapping_get_query(context).\
filter_by(id=bdm_id).\
update(values)
@require_context
@@ -2859,7 +2854,8 @@ def block_device_mapping_update_or_create(context, values):
virtual_name = values['virtual_name']
if (virtual_name is not None and
block_device.is_swap_or_ephemeral(virtual_name)):
session.query(models.BlockDeviceMapping).\
_block_device_mapping_get_query(context, session=session).\
filter_by(instance_uuid=values['instance_uuid']).\
filter_by(virtual_name=virtual_name).\
filter(models.BlockDeviceMapping.device_name !=
@@ -2876,19 +2872,15 @@ def block_device_mapping_get_all_by_instance(context, instance_uuid):
@require_context
def block_device_mapping_destroy(context, bdm_id):
session = get_session()
with session.begin():
session.query(models.BlockDeviceMapping).\
filter_by(id=bdm_id).\
soft_delete()
_block_device_mapping_get_query(context).\
filter_by(id=bdm_id).\
soft_delete()
@require_context
def block_device_mapping_destroy_by_instance_and_volume(context, instance_uuid,
volume_id):
session = get_session()
with session.begin():
_block_device_mapping_get_query(context, session=session).\
_block_device_mapping_get_query(context).\
filter_by(instance_uuid=instance_uuid).\
filter_by(volume_id=volume_id).\
soft_delete()
@@ -2897,9 +2889,7 @@ def block_device_mapping_destroy_by_instance_and_volume(context, instance_uuid,
@require_context
def block_device_mapping_destroy_by_instance_and_device(context, instance_uuid,
device_name):
session = get_session()
with session.begin():
_block_device_mapping_get_query(context, session=session).\
_block_device_mapping_get_query(context).\
filter_by(instance_uuid=instance_uuid).\
filter_by(device_name=device_name).\
soft_delete()