openstack/cinder
Code Issues Proposed changes

Merge "Update volume and snapshot status on delete"

Browse Source
This commit is contained in:
Jenkins 2012-10-22 22:37:53 +00:00 committed by Gerrit Code Review
commit f41e596607
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/db/sqlalchemy/api.py
View File

@ -971,7 +971,8 @@ def volume_destroy(context, volume_id):
with session.begin():
session.query(models.Volume).\
filter_by(id=volume_id).\
update({'deleted': True,
update({'status': 'deleted',
'deleted': True,
'deleted_at': timeutils.utcnow(),
'updated_at': literal_column('updated_at')})
session.query(models.IscsiTarget).\
@ -1173,7 +1174,8 @@ def snapshot_destroy(context, snapshot_id):
with session.begin():
session.query(models.Snapshot).\
filter_by(id=snapshot_id).\
update({'deleted': True,
update({'status': 'deleted',
'deleted': True,
'deleted_at': timeutils.utcnow(),
'updated_at': literal_column('updated_at')})

6
cinder/tests/test_volume.py
View File

@ -113,6 +113,9 @@ class VolumeTestCase(test.TestCase):
volume_id).id)
self.volume.delete_volume(self.context, volume_id)
vol = db.volume_get(context.get_admin_context(read_deleted='yes'),
volume_id)
self.assertEquals(vol['status'], 'deleted')
self.assertEquals(len(test_notifier.NOTIFICATIONS), 4)
self.assertRaises(exception.NotFound,
db.volume_get,
@ -263,6 +266,9 @@ class VolumeTestCase(test.TestCase):
snapshot_id).id)
self.volume.delete_snapshot(self.context, snapshot_id)
snap = db.snapshot_get(context.get_admin_context(read_deleted='yes'),
snapshot_id)
self.assertEquals(snap['status'], 'deleted')
self.assertRaises(exception.NotFound,
db.snapshot_get,
self.context,