diff --git a/castellan/key_manager/barbican_key_manager.py b/castellan/key_manager/barbican_key_manager.py index 9545c1a..892da26 100644 --- a/castellan/key_manager/barbican_key_manager.py +++ b/castellan/key_manager/barbican_key_manager.py @@ -33,11 +33,6 @@ from castellan.common import exception from castellan.common.objects import key as key_base_class from castellan.common.objects import opaque_data as op_data -from castellan.common.objects import passphrase -from castellan.common.objects import private_key as pri_key -from castellan.common.objects import public_key as pub_key -from castellan.common.objects import symmetric_key as sym_key -from castellan.common.objects import x_509 from castellan.i18n import _ from castellan.key_manager import key_manager @@ -85,14 +80,6 @@ class BarbicanKeyManager(key_manager.KeyManager): """Key Manager Interface that wraps the Barbican client API.""" - - _secret_type_dict = { - op_data.OpaqueData: 'opaque', - passphrase.Passphrase: 'passphrase', - pri_key.PrivateKey: 'private', - pub_key.PublicKey: 'public', - sym_key.SymmetricKey: 'symmetric', - x_509.X509: 'certificate'} def __init__(self, configuration): self._barbican_client = None diff --git a/castellan/key_manager/key_manager.py b/castellan/key_manager/key_manager.py index 7a29b09..028f58b 100644 --- a/castellan/key_manager/key_manager.py +++ b/castellan/key_manager/key_manager.py @@ -19,6 +19,13 @@ import abc +from castellan.common.objects import opaque_data as op_data +from castellan.common.objects import passphrase +from castellan.common.objects import private_key as pri_key +from castellan.common.objects import public_key as pub_key +from castellan.common.objects import symmetric_key as sym_key +from castellan.common.objects import x_509 + class KeyManager(object, metaclass=abc.ABCMeta): """Base Key Manager Interface @@ -26,6 +33,14 @@ A Key Manager is responsible for managing encryption keys for volumes. A Key Manager is responsible for creating, reading, and deleting keys. """ + + _secret_type_dict = { + op_data.OpaqueData: "opaque", + passphrase.Passphrase: "passphrase", + pri_key.PrivateKey: "private", + pub_key.PublicKey: "public", + sym_key.SymmetricKey: "symmetric", + x_509.X509: "certificate"} @abc.abstractmethod def __init__(self, configuration): diff --git a/castellan/key_manager/vault_key_manager.py b/castellan/key_manager/vault_key_manager.py index f198ffe..2510f2d 100644 --- a/castellan/key_manager/vault_key_manager.py +++ b/castellan/key_manager/vault_key_manager.py @@ -33,12 +33,9 @@ import requests from castellan.common import exception -from castellan.common.objects import opaque_data as op_data -from castellan.common.objects import passphrase from castellan.common.objects import private_key as pri_key from castellan.common.objects import public_key as pub_key from castellan.common.objects import symmetric_key as sym_key -from castellan.common.objects import x_509 from castellan.i18n import _ from castellan.key_manager import key_manager @@ -83,14 +80,6 @@ class VaultKeyManager(key_manager.KeyManager): """Key Manager Interface that wraps the Vault REST API.""" - _secret_type_dict = { - op_data.OpaqueData: 'opaque', - passphrase.Passphrase: 'passphrase', - pri_key.PrivateKey: 'private', - pub_key.PublicKey: 'public', - sym_key.SymmetricKey: 'symmetric', - x_509.X509: 'certificate'} - def __init__(self, configuration): self._conf = configuration self._conf.register_opts(_vault_opts, group=_VAULT_OPT_GROUP)