openstack/cinder
Code Issues Proposed changes

Merge "Volume type with encryption comparison"

Browse Source
This commit is contained in:
Jenkins 2017-08-02 01:49:56 +00:00 committed by Gerrit Code Review
commit 40f9e53a6b
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/tests/unit/test_volume_types.py
View File

@ -414,11 +414,9 @@ class VolumeTypeTestCase(test.TestCase):
# And add encryption for good measure # And add encryption for good measure
enc_keyvals1 = {'cipher': 'c1', 'key_size': 256, 'provider': 'p1', enc_keyvals1 = {'cipher': 'c1', 'key_size': 256, 'provider': 'p1',
'control_location': 'front-end', 'control_location': 'front-end'}
'encryption_id': 'uuid1'}
enc_keyvals2 = {'cipher': 'c1', 'key_size': 128, 'provider': 'p1', enc_keyvals2 = {'cipher': 'c1', 'key_size': 128, 'provider': 'p1',
'control_location': 'front-end', 'control_location': 'front-end'}
'encryption_id': 'uuid2'}
db.volume_type_encryption_create(self.ctxt, type_ref1['id'], db.volume_type_encryption_create(self.ctxt, type_ref1['id'],
enc_keyvals1) enc_keyvals1)
db.volume_type_encryption_create(self.ctxt, type_ref2['id'], db.volume_type_encryption_create(self.ctxt, type_ref2['id'],
@ -444,8 +442,7 @@ class VolumeTypeTestCase(test.TestCase):
'control_location': (None, 'front-end'), 'control_location': (None, 'front-end'),
'deleted': (None, False), 'deleted': (None, False),
'key_size': (None, 256), 'key_size': (None, 256),
'provider': (None, 'p1'), 'provider': (None, 'p1')},
'encryption_id': (None, 'uuid1')},
diff['encryption']) diff['encryption'])
def test_encryption_create(self): def test_encryption_create(self):

2
cinder/volume/volume_types.py
View File

@ -37,7 +37,7 @@ CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
QUOTAS = quota.QUOTAS QUOTAS = quota.QUOTAS
ENCRYPTION_IGNORED_FIELDS = ['volume_type_id', 'created_at', 'updated_at', ENCRYPTION_IGNORED_FIELDS = ['volume_type_id', 'created_at', 'updated_at',
'deleted_at'] 'deleted_at', 'encryption_id']
def create(context, def create(context,