openstack
/
cinder
Code Issues Proposed changes

Merge "Added provider_id to volume and snapshot object"

This commit is contained in:
Jenkins 2015-04-06 11:10:50 +00:00 committed by Gerrit Code Review
parent b8180affc9 c4d86761a2
commit c5cb524967
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/objects/snapshot.py
View File

@ -54,6 +54,7 @@ class Snapshot(base.CinderPersistentObject, base.CinderObject,
'volume_type_id': fields.UUIDField(nullable=True),
'provider_location': fields.StringField(nullable=True),
'provider_id': fields.UUIDField(nullable=True),
'metadata': fields.DictOfStringsField(),
'volume': fields.ObjectField('Volume', nullable=True),

1
cinder/objects/volume.py
View File

@ -56,6 +56,7 @@ class Volume(base.CinderPersistentObject, base.CinderObject,
'display_name': fields.StringField(nullable=True),
'display_description': fields.StringField(nullable=True),
'provider_id': fields.UUIDField(nullable=True),
'provider_location': fields.StringField(nullable=True),
'provider_auth': fields.StringField(nullable=True),
'provider_geometry': fields.StringField(nullable=True),

7
cinder/tests/objects/test_snapshot.py
View File

@ -56,6 +56,13 @@ class TestSnapshot(test_objects._LocalTest):
self.assertEqual(fake_snapshot['id'], snapshot.id)
self.assertEqual(fake_snapshot['volume_id'], snapshot.volume_id)
@mock.patch('cinder.db.snapshot_create',
return_value=dict(provider_id='1111-aaaa', **fake_snapshot))
def test_create_with_provider_id(self, snapshot_create):
snapshot = snapshot_obj.Snapshot(context=self.context)
snapshot.create()
self.assertEqual('1111-aaaa', snapshot.provider_id)
@mock.patch('cinder.db.snapshot_update')
def test_save(self, snapshot_update):
snapshot = snapshot_obj.Snapshot._from_db_object(

10
cinder/tests/test_volume.py
View File

@ -679,6 +679,16 @@ class VolumeTestCase(BaseVolumeTestCase):
self.assertEqual(volume['volume_type_id'], db_vol_type.get('id'))
self.assertIsNotNone(volume['encryption_key_id'])
def test_create_volume_with_provider_id(self):
volume_params_with_provider_id = dict(provider_id='1111-aaaa',
**self.volume_params)
volume = tests_utils.create_volume(self.context,
**volume_params_with_provider_id)
self.volume.create_volume(self.context, volume['id'])
self.assertEqual('1111-aaaa', volume['provider_id'])
def test_create_delete_volume_with_encrypted_volume_type(self):
self.stubs.Set(keymgr, "API", fake_keymgr.fake_api)