From 0505180d1f39fd9e5342cc2800ea038ac77fc96b Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Mon, 31 Aug 2015 15:10:39 +1000 Subject: [PATCH] Move admin_token to base _plugins dir The admin_token isn't an identity plugin. Put it in base _plugins dir. This won't affect loading. Change-Id: I5e8935dafe3dcc01bf8f4f5cf08ab2b7404c5acc --- keystoneauth1/loading/_plugins/{identity => }/admin_token.py | 0 keystoneauth1/tests/unit/auth/test_token_endpoint.py | 2 +- setup.cfg | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename keystoneauth1/loading/_plugins/{identity => }/admin_token.py (100%) diff --git a/keystoneauth1/loading/_plugins/identity/admin_token.py b/keystoneauth1/loading/_plugins/admin_token.py similarity index 100% rename from keystoneauth1/loading/_plugins/identity/admin_token.py rename to keystoneauth1/loading/_plugins/admin_token.py diff --git a/keystoneauth1/tests/unit/auth/test_token_endpoint.py b/keystoneauth1/tests/unit/auth/test_token_endpoint.py index fe77d63a..9a06d992 100644 --- a/keystoneauth1/tests/unit/auth/test_token_endpoint.py +++ b/keystoneauth1/tests/unit/auth/test_token_endpoint.py @@ -12,7 +12,7 @@ from testtools import matchers -from keystoneauth1.loading._plugins.identity import admin_token as loader +from keystoneauth1.loading._plugins import admin_token as loader from keystoneauth1 import session from keystoneauth1.tests.unit import utils from keystoneauth1 import token_endpoint diff --git a/setup.cfg b/setup.cfg index 5607609b..49f91b43 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,7 @@ packages = keystoneauth1.plugin = password = keystoneauth1.loading._plugins.identity.generic:Password token = keystoneauth1.loading._plugins.identity.generic:Token - admin_token = keystoneauth1.loading._plugins.identity.admin_token:AdminToken + admin_token = keystoneauth1.loading._plugins.admin_token:AdminToken v2password = keystoneauth1.loading._plugins.identity.v2:Password v2token = keystoneauth1.loading._plugins.identity.v2:Token v3password = keystoneauth1.loading._plugins.identity.v3:Password