From d4fadcb5215f074c5d6a1986a3ecd2a6cbd3e0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Douglas=20Mendiz=C3=A1bal?= Date: Thu, 19 Mar 2015 10:40:18 -0500 Subject: [PATCH] Renames for consistent namespaces Castellan was using both key_mgr and keymgr for module names, leading to inconsistent namespaces such as: castellan.keymgr.key_mgr.KeyManager This CR renames both instances to key_manager to be consistent with the program name. Change-Id: Ie07a70c14939b6c797e812c441d29218c2940ade --- castellan/{keymgr => key_manager}/__init__.py | 6 +++--- castellan/{keymgr => key_manager}/key.py | 0 .../{keymgr/key_mgr.py => key_manager/key_manager.py} | 0 .../not_implemented_key_manager.py} | 4 ++-- castellan/{keymgr => key_manager}/symmetric_key.py | 2 +- castellan/tests/{keymgr => key_manager}/__init__.py | 0 castellan/tests/{keymgr => key_manager}/fake.py | 4 ++-- .../mock_key_mgr.py => key_manager/mock_key_manager.py} | 6 +++--- castellan/tests/{keymgr => key_manager}/test_key.py | 2 +- .../test_key_mgr.py => key_manager/test_key_manager.py} | 0 .../test_mock_key_manager.py} | 6 +++--- .../test_not_implemented_key_manager.py} | 8 ++++---- 12 files changed, 19 insertions(+), 19 deletions(-) rename castellan/{keymgr => key_manager}/__init__.py (86%) rename castellan/{keymgr => key_manager}/key.py (100%) rename castellan/{keymgr/key_mgr.py => key_manager/key_manager.py} (100%) rename castellan/{keymgr/not_implemented_key_mgr.py => key_manager/not_implemented_key_manager.py} (92%) rename castellan/{keymgr => key_manager}/symmetric_key.py (97%) rename castellan/tests/{keymgr => key_manager}/__init__.py (100%) rename castellan/tests/{keymgr => key_manager}/fake.py (87%) rename castellan/tests/{keymgr/mock_key_mgr.py => key_manager/mock_key_manager.py} (97%) rename castellan/tests/{keymgr => key_manager}/test_key.py (97%) rename castellan/tests/{keymgr/test_key_mgr.py => key_manager/test_key_manager.py} (100%) rename castellan/tests/{keymgr/test_mock_key_mgr.py => key_manager/test_mock_key_manager.py} (94%) rename castellan/tests/{keymgr/test_not_implemented_key_mgr.py => key_manager/test_not_implemented_key_manager.py} (84%) diff --git a/castellan/keymgr/__init__.py b/castellan/key_manager/__init__.py similarity index 86% rename from castellan/keymgr/__init__.py rename to castellan/key_manager/__init__.py index 59488dc9..cb38bd3d 100644 --- a/castellan/keymgr/__init__.py +++ b/castellan/key_manager/__init__.py @@ -17,15 +17,15 @@ from oslo_config import cfg from oslo_utils import importutils -keymgr_opts = [ +key_manager_opts = [ cfg.StrOpt('api_class', help='The full class name of the key manager API class'), ] CONF = cfg.CONF -CONF.register_opts(keymgr_opts, group='keymgr') +CONF.register_opts(key_manager_opts, group='key_manager') def API(): - cls = importutils.import_class(CONF.keymgr.api_class) + cls = importutils.import_class(CONF.key_manager.api_class) return cls() diff --git a/castellan/keymgr/key.py b/castellan/key_manager/key.py similarity index 100% rename from castellan/keymgr/key.py rename to castellan/key_manager/key.py diff --git a/castellan/keymgr/key_mgr.py b/castellan/key_manager/key_manager.py similarity index 100% rename from castellan/keymgr/key_mgr.py rename to castellan/key_manager/key_manager.py diff --git a/castellan/keymgr/not_implemented_key_mgr.py b/castellan/key_manager/not_implemented_key_manager.py similarity index 92% rename from castellan/keymgr/not_implemented_key_mgr.py rename to castellan/key_manager/not_implemented_key_manager.py index dc7b21f4..30254c63 100644 --- a/castellan/keymgr/not_implemented_key_mgr.py +++ b/castellan/key_manager/not_implemented_key_manager.py @@ -17,10 +17,10 @@ Key manager implementation that raises NotImplementedError """ -from castellan.keymgr import key_mgr +from castellan.key_manager import key_manager -class NotImplementedKeyManager(key_mgr.KeyManager): +class NotImplementedKeyManager(key_manager.KeyManager): """Key Manager Interface that raises NotImplementedError for all operations """ diff --git a/castellan/keymgr/symmetric_key.py b/castellan/key_manager/symmetric_key.py similarity index 97% rename from castellan/keymgr/symmetric_key.py rename to castellan/key_manager/symmetric_key.py index 04fbb84a..f0b993d3 100644 --- a/castellan/keymgr/symmetric_key.py +++ b/castellan/key_manager/symmetric_key.py @@ -19,7 +19,7 @@ Base SymmetricKey Class This module defines the SymmetricKey class. """ -from castellan.keymgr import key +from castellan.key_manager import key class SymmetricKey(key.Key): diff --git a/castellan/tests/keymgr/__init__.py b/castellan/tests/key_manager/__init__.py similarity index 100% rename from castellan/tests/keymgr/__init__.py rename to castellan/tests/key_manager/__init__.py diff --git a/castellan/tests/keymgr/fake.py b/castellan/tests/key_manager/fake.py similarity index 87% rename from castellan/tests/keymgr/fake.py rename to castellan/tests/key_manager/fake.py index f893399e..a3e2782b 100644 --- a/castellan/tests/keymgr/fake.py +++ b/castellan/tests/key_manager/fake.py @@ -17,8 +17,8 @@ """Implementation of a fake key manager.""" -from castellan.tests.keymgr import mock_key_mgr +from castellan.tests.key_manager import mock_key_manager def fake_api(): - return mock_key_mgr.MockKeyManager() + return mock_key_manager.MockKeyManager() diff --git a/castellan/tests/keymgr/mock_key_mgr.py b/castellan/tests/key_manager/mock_key_manager.py similarity index 97% rename from castellan/tests/keymgr/mock_key_mgr.py rename to castellan/tests/key_manager/mock_key_manager.py index 61017d4d..8722f7d6 100644 --- a/castellan/tests/keymgr/mock_key_mgr.py +++ b/castellan/tests/key_manager/mock_key_manager.py @@ -32,11 +32,11 @@ import random import uuid from castellan.common import exception -from castellan.keymgr import key_mgr -from castellan.keymgr import symmetric_key as sym_key +from castellan.key_manager import key_manager +from castellan.key_manager import symmetric_key as sym_key -class MockKeyManager(key_mgr.KeyManager): +class MockKeyManager(key_manager.KeyManager): """Mocking manager for integration tests. diff --git a/castellan/tests/keymgr/test_key.py b/castellan/tests/key_manager/test_key.py similarity index 97% rename from castellan/tests/keymgr/test_key.py rename to castellan/tests/key_manager/test_key.py index b08a19cc..20c1db59 100644 --- a/castellan/tests/keymgr/test_key.py +++ b/castellan/tests/key_manager/test_key.py @@ -20,7 +20,7 @@ Test cases for the key classes. import array import binascii -from castellan.keymgr import symmetric_key as sym_key +from castellan.key_manager import symmetric_key as sym_key from castellan.tests import base diff --git a/castellan/tests/keymgr/test_key_mgr.py b/castellan/tests/key_manager/test_key_manager.py similarity index 100% rename from castellan/tests/keymgr/test_key_mgr.py rename to castellan/tests/key_manager/test_key_manager.py diff --git a/castellan/tests/keymgr/test_mock_key_mgr.py b/castellan/tests/key_manager/test_mock_key_manager.py similarity index 94% rename from castellan/tests/keymgr/test_mock_key_mgr.py rename to castellan/tests/key_manager/test_mock_key_manager.py index d517fa6c..20762470 100644 --- a/castellan/tests/keymgr/test_mock_key_mgr.py +++ b/castellan/tests/key_manager/test_mock_key_manager.py @@ -22,9 +22,9 @@ import binascii from castellan.common import exception from castellan import context -from castellan.keymgr import symmetric_key as sym_key -from castellan.tests.keymgr import mock_key_mgr -from castellan.tests.keymgr import test_key_mgr +from castellan.key_manager import symmetric_key as sym_key +from castellan.tests.key_manager import mock_key_manager as mock_key_mgr +from castellan.tests.key_manager import test_key_manager as test_key_mgr class MockKeyManagerTestCase(test_key_mgr.KeyManagerTestCase): diff --git a/castellan/tests/keymgr/test_not_implemented_key_mgr.py b/castellan/tests/key_manager/test_not_implemented_key_manager.py similarity index 84% rename from castellan/tests/keymgr/test_not_implemented_key_mgr.py rename to castellan/tests/key_manager/test_not_implemented_key_manager.py index ebfd7739..b021d191 100644 --- a/castellan/tests/keymgr/test_not_implemented_key_mgr.py +++ b/castellan/tests/key_manager/test_not_implemented_key_manager.py @@ -17,14 +17,14 @@ Test cases for the not implemented key manager. """ -from castellan.keymgr import not_implemented_key_mgr -from castellan.tests.keymgr import test_key_mgr +from castellan.key_manager import not_implemented_key_manager +from castellan.tests.key_manager import test_key_manager -class NotImplementedKeyManagerTestCase(test_key_mgr.KeyManagerTestCase): +class NotImplementedKeyManagerTestCase(test_key_manager.KeyManagerTestCase): def _create_key_manager(self): - return not_implemented_key_mgr.NotImplementedKeyManager() + return not_implemented_key_manager.NotImplementedKeyManager() def test_create_key(self): self.assertRaises(NotImplementedError,