diff --git a/keystone/cmd/cli.py b/keystone/cmd/cli.py index 3ebe2f661c..2f9998368c 100644 --- a/keystone/cmd/cli.py +++ b/keystone/cmd/cli.py @@ -524,7 +524,7 @@ class FernetSetup(BasePermissionsSetup): @classmethod def main(cls): - from keystone.token.providers.fernet import utils as fernet + from keystone.common import fernet_utils as fernet keystone_user_id, keystone_group_id = cls.get_user_group() fernet.create_key_directory(keystone_user_id, keystone_group_id) @@ -555,7 +555,7 @@ class FernetRotate(BasePermissionsSetup): @classmethod def main(cls): - from keystone.token.providers.fernet import utils as fernet + from keystone.common import fernet_utils as fernet keystone_user_id, keystone_group_id = cls.get_user_group() if fernet.validate_key_repository(requires_write=True): diff --git a/keystone/cmd/doctor/tokens_fernet.py b/keystone/cmd/doctor/tokens_fernet.py index 30681fd66a..d80ca5ed54 100644 --- a/keystone/cmd/doctor/tokens_fernet.py +++ b/keystone/cmd/doctor/tokens_fernet.py @@ -12,7 +12,7 @@ import keystone.conf -from keystone.token.providers.fernet import utils as fernet_utils +from keystone.common import fernet_utils CONF = keystone.conf.CONF diff --git a/keystone/token/providers/fernet/utils.py b/keystone/common/fernet_utils.py similarity index 100% rename from keystone/token/providers/fernet/utils.py rename to keystone/common/fernet_utils.py diff --git a/keystone/tests/unit/ksfixtures/key_repository.py b/keystone/tests/unit/ksfixtures/key_repository.py index 7784bddcb8..842cf396d4 100644 --- a/keystone/tests/unit/ksfixtures/key_repository.py +++ b/keystone/tests/unit/ksfixtures/key_repository.py @@ -12,7 +12,7 @@ import fixtures -from keystone.token.providers.fernet import utils +from keystone.common import fernet_utils as utils class KeyRepository(fixtures.Fixture): diff --git a/keystone/tests/unit/token/test_fernet_provider.py b/keystone/tests/unit/token/test_fernet_provider.py index 55b9f41c0f..94dbe9a5e2 100644 --- a/keystone/tests/unit/token/test_fernet_provider.py +++ b/keystone/tests/unit/token/test_fernet_provider.py @@ -20,6 +20,7 @@ import msgpack from oslo_utils import timeutils from six.moves import urllib +from keystone.common import fernet_utils from keystone.common import utils import keystone.conf from keystone import exception @@ -30,7 +31,6 @@ from keystone.tests.unit.ksfixtures import database from keystone.token import provider from keystone.token.providers import fernet from keystone.token.providers.fernet import token_formatters -from keystone.token.providers.fernet import utils as fernet_utils CONF = keystone.conf.CONF diff --git a/keystone/token/providers/fernet/token_formatters.py b/keystone/token/providers/fernet/token_formatters.py index 1571af9f83..ad2613bb90 100644 --- a/keystone/token/providers/fernet/token_formatters.py +++ b/keystone/token/providers/fernet/token_formatters.py @@ -24,12 +24,12 @@ from six.moves import map from six.moves import urllib from keystone.auth import plugins as auth_plugins +from keystone.common import fernet_utils as utils from keystone.common import utils as ks_utils import keystone.conf from keystone import exception from keystone.i18n import _, _LI from keystone.token import provider -from keystone.token.providers.fernet import utils CONF = keystone.conf.CONF