openstack
/
cinder
Code Issues Proposed changes

Fix call to Barbican Secrets create() 

Calls to backup encrypted volumes fail because the cinder
barbican keymanager passes incorrect positional parameters
to barbican Secrets.create().

Change-Id: I7b0c2bafce12964ffcfe1066953c2c93ca460e92
Closes-bug: 1552684
This commit is contained in:
Ollie Leahy 2016-03-03 14:05:14 +00:00 committed by Ollie Leahy
parent 497daf1e26
commit 6474164fd5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/keymgr/barbican.py
View File

@ -197,6 +197,7 @@ class BarbicanKeyManager(key_mgr.KeyManager):
payload_content_encoding, payload_content_encoding,
algorithm, algorithm,
bit_length, bit_length,
None,
mode, mode,
expiration) expiration)
secret_ref = secret.store() secret_ref = secret.store()

5
cinder/tests/unit/keymgr/test_barbican.py
View File

@ -127,6 +127,7 @@ class BarbicanKeyManagerTestCase(test_key_mgr.KeyManagerTestCase):
'base64', 'base64',
original_secret_metadata.algorithm, original_secret_metadata.algorithm,
original_secret_metadata.bit_length, original_secret_metadata.bit_length,
None,
original_secret_metadata.mode, original_secret_metadata.mode,
original_secret_metadata.expiration) original_secret_metadata.expiration)
self.create.return_value.store.assert_called_once_with() self.create.return_value.store.assert_called_once_with()
@ -209,7 +210,7 @@ class BarbicanKeyManagerTestCase(test_key_mgr.KeyManagerTestCase):
b'AQKgsw==', b'AQKgsw==',
'application/octet-stream', 'application/octet-stream',
'base64', 'base64',
'AES', 32, 'CBC', 'AES', 32, None, 'CBC',
None) None)
self.assertEqual(self.key_id, returned_uuid) self.assertEqual(self.key_id, returned_uuid)
@ -226,7 +227,7 @@ class BarbicanKeyManagerTestCase(test_key_mgr.KeyManagerTestCase):
secret_key_text, secret_key_text,
'text/plain', 'text/plain',
None, None,
'AES', 256, 'CBC', 'AES', 256, None, 'CBC',
None) None)
self.create.return_value.store.assert_called_once_with() self.create.return_value.store.assert_called_once_with()