diff options
| author | Claudiu Belu <cbelu@cloudbasesolutions.com> | 2016-02-10 23:56:05 +0200 |
|---|---|---|
| committer | Claudiu Belu <cbelu@cloudbasesolutions.com> | 2016-03-21 14:38:15 +0200 |
| commit | c514065c70e7f0dcff87b3daccfdd8978c10d1c8 (patch) | |
| tree | db1c84d166ec2d99f0776dda7dfe8d8e471721f6 /nova/keymgr | |
| parent | c4763d46fe76c524363a0cf55d1e8afe4bd23f53 (diff) | |
| download | nova-c514065c70e7f0dcff87b3daccfdd8978c10d1c8.tar.gz | |
Fixes hex decoding related unit tests
Uses codecs module in order to decode hex.
Enables keymgr unit tests for gate-nova-python34.
Enables volume.encryptors unit tests for gate-nova-python34.
Partially Implements: blueprint nova-python3-newton
Change-Id: I43504da03c42c6b684da0ca1c3640c31a9843a45
Diffstat (limited to 'nova/keymgr')
| -rw-r--r-- | nova/keymgr/mock_key_mgr.py | 6 | ||||
| -rw-r--r-- | nova/keymgr/single_key_mgr.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/keymgr/mock_key_mgr.py b/nova/keymgr/mock_key_mgr.py index dcd76050e4..ab947c1cb2 100644 --- a/nova/keymgr/mock_key_mgr.py +++ b/nova/keymgr/mock_key_mgr.py @@ -27,6 +27,7 @@ this class. """ import array +import codecs from oslo_log import log as logging from oslo_utils import uuidutils @@ -39,6 +40,7 @@ from nova import utils LOG = logging.getLogger(__name__) +decode_hex = codecs.getdecoder("hex_codec") class MockKeyManager(key_mgr.KeyManager): @@ -60,14 +62,14 @@ class MockKeyManager(key_mgr.KeyManager): def _generate_hex_key(self, **kwargs): key_length = kwargs.get('key_length', 256) # hex digit => 4 bits - hex_encoded = utils.generate_password(length=key_length / 4, + hex_encoded = utils.generate_password(length=key_length // 4, symbolgroups='0123456789ABCDEF') return hex_encoded def _generate_key(self, **kwargs): _hex = self._generate_hex_key(**kwargs) return key.SymmetricKey('AES', - array.array('B', _hex.decode('hex')).tolist()) + array.array('B', decode_hex(_hex)[0]).tolist()) def create_key(self, ctxt, **kwargs): """Creates a key. diff --git a/nova/keymgr/single_key_mgr.py b/nova/keymgr/single_key_mgr.py index f12b35e8fe..6cf0e75670 100644 --- a/nova/keymgr/single_key_mgr.py +++ b/nova/keymgr/single_key_mgr.py @@ -49,7 +49,7 @@ class SingleKeyManager(mock_key_mgr.MockKeyManager): def _generate_hex_key(self, **kwargs): key_length = kwargs.get('key_length', 256) - return '0' * (key_length / 4) # hex digit => 4 bits + return b'0' * (key_length // 4) # hex digit => 4 bits def _generate_key_id(self): return self.key_id |