openstack
/
cinder
Code Issues Proposed changes

Merge "Include volume_metadata with object on vol create"

This commit is contained in:
Jenkins 2012-08-01 05:27:11 +00:00 committed by Gerrit Code Review
parent 7d30cb059a 5b605b6b8a
commit 424e6af7c0
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,7 +434,16 @@ def volume_create(context, values):
with session.begin():
volume_ref.save(session=session)
return volume_ref
meta = volume_metadata_get(context, volume_ref.id)
volume_ref.metadata = meta
result = model_query(context, models.Volume, read_deleted="no").\
options(joinedload('volume_metadata')).\
filter_by(id=volume_ref['id']).first()
if not result:
raise exception.VolumeNotFound(volume_id=volume_ref['id'])
return result
@require_admin_context

20
cinder/tests/test_volume.py
View File

@ -53,7 +53,7 @@ class VolumeTestCase(test.TestCase):
super(VolumeTestCase, self).tearDown()
@staticmethod
def _create_volume(size='0', snapshot_id=None):
def _create_volume(size='0', snapshot_id=None, metadata=None):
"""Create a volume object."""
vol = {}
vol['size'] = size
@ -63,6 +63,8 @@ class VolumeTestCase(test.TestCase):
vol['availability_zone'] = FLAGS.storage_availability_zone
vol['status'] = "creating"
vol['attach_status'] = "detached"
if metadata is not None:
vol['metadata'] = metadata
return db.volume_create(context.get_admin_context(), vol)
def test_create_delete_volume(self):
@ -79,6 +81,22 @@ class VolumeTestCase(test.TestCase):
self.context,
volume_id)
def test_create_delete_volume_with_metadata(self):
"""Test volume can be created and deleted."""
test_meta = {'fake_key': 'fake_value'}
volume = self._create_volume('0', None, test_meta)
volume_id = volume['id']
self.volume.create_volume(self.context, volume_id)
result_meta = {
volume.volume_metadata[0].key: volume.volume_metadata[0].value}
self.assertEqual(result_meta, test_meta)
self.volume.delete_volume(self.context, volume_id)
self.assertRaises(exception.NotFound,
db.volume_get,
self.context,
volume_id)
def test_delete_busy_volume(self):
"""Test volume survives deletion if driver reports it as busy."""
volume = self._create_volume()