From a08ca8f49455b0bd571e71141256848b8612a8cb Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Sun, 2 Aug 2015 14:10:04 +1000
Subject: [PATCH] Remove auth/ directory

The /auth directory made sense when we were seperating the plugins from
the rest of keystoneclient, however now we are in keystoneauth there
really is no need for the auth subdirectory.

Change-Id: I94f12780af4f914ead93796a052e9dc82c6c2f81
---
 keystoneauth1/__init__.py                     | 38 +++++++++++++++++++
 keystoneauth1/auth/__init__.py                | 38 -------------------
 keystoneauth1/{auth => }/base.py              |  0
 keystoneauth1/{auth => }/cli.py               |  2 +-
 keystoneauth1/{auth => }/conf.py              |  2 +-
 keystoneauth1/{auth => }/identity/__init__.py |  8 ++--
 keystoneauth1/{auth => }/identity/access.py   |  2 +-
 keystoneauth1/{auth => }/identity/base.py     |  2 +-
 .../{auth => }/identity/generic/__init__.py   |  6 +--
 .../{auth => }/identity/generic/base.py       |  2 +-
 .../{auth => }/identity/generic/password.py   |  6 +--
 .../{auth => }/identity/generic/token.py      |  6 +--
 keystoneauth1/{auth => }/identity/v2.py       |  2 +-
 .../{auth => }/identity/v3/__init__.py        | 10 ++---
 keystoneauth1/{auth => }/identity/v3/base.py  |  2 +-
 .../{auth => }/identity/v3/federation.py      |  4 +-
 keystoneauth1/{auth => }/identity/v3/k2k.py   |  8 ++--
 .../{auth => }/identity/v3/password.py        |  2 +-
 keystoneauth1/{auth => }/identity/v3/token.py |  2 +-
 keystoneauth1/tests/unit/auth/test_access.py  |  6 +--
 keystoneauth1/tests/unit/auth/test_cli.py     |  4 +-
 keystoneauth1/tests/unit/auth/test_conf.py    |  8 ++--
 .../tests/unit/auth/test_identity_common.py   |  4 +-
 .../tests/unit/auth/test_identity_v2.py       |  2 +-
 .../tests/unit/auth/test_identity_v3.py       |  4 +-
 .../unit/auth/test_identity_v3_federation.py  |  2 +-
 .../tests/unit/auth/test_password.py          |  8 ++--
 keystoneauth1/tests/unit/auth/test_token.py   |  8 ++--
 .../tests/unit/auth/test_token_endpoint.py    |  2 +-
 keystoneauth1/tests/unit/auth/utils.py        |  2 +-
 keystoneauth1/tests/unit/test_session.py      |  2 +-
 keystoneauth1/{auth => }/token_endpoint.py    |  2 +-
 setup.cfg                                     | 14 +++----
 33 files changed, 105 insertions(+), 105 deletions(-)
 delete mode 100644 keystoneauth1/auth/__init__.py
 rename keystoneauth1/{auth => }/base.py (100%)
 rename keystoneauth1/{auth => }/cli.py (98%)
 rename keystoneauth1/{auth => }/conf.py (99%)
 rename keystoneauth1/{auth => }/identity/__init__.py (83%)
 rename keystoneauth1/{auth => }/identity/access.py (97%)
 rename keystoneauth1/{auth => }/identity/base.py (99%)
 rename keystoneauth1/{auth => }/identity/generic/__init__.py (74%)
 rename keystoneauth1/{auth => }/identity/generic/base.py (99%)
 rename keystoneauth1/{auth => }/identity/generic/password.py (95%)
 rename keystoneauth1/{auth => }/identity/generic/token.py (91%)
 rename keystoneauth1/{auth => }/identity/v2.py (99%)
 rename keystoneauth1/{auth => }/identity/v3/__init__.py (73%)
 rename keystoneauth1/{auth => }/identity/v3/base.py (99%)
 rename keystoneauth1/{auth => }/identity/v3/federation.py (97%)
 rename keystoneauth1/{auth => }/identity/v3/k2k.py (97%)
 rename keystoneauth1/{auth => }/identity/v3/password.py (98%)
 rename keystoneauth1/{auth => }/identity/v3/token.py (97%)
 rename keystoneauth1/{auth => }/token_endpoint.py (97%)

diff --git a/keystoneauth1/__init__.py b/keystoneauth1/__init__.py
index e69de29b..cfa71697 100644
--- a/keystoneauth1/__init__.py
+++ b/keystoneauth1/__init__.py
@@ -0,0 +1,38 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+
+from keystoneauth1.base import *  # noqa
+from keystoneauth1.cli import *  # noqa
+from keystoneauth1.conf import *  # noqa
+
+
+__all__ = [
+    # auth.base
+    'AUTH_INTERFACE',
+    'BaseAuthPlugin',
+    'get_available_plugin_names',
+    'get_available_plugin_classes',
+    'get_plugin_class',
+    'IDENTITY_AUTH_HEADER_NAME',
+    'PLUGIN_NAMESPACE',
+
+    # auth.cli
+    'load_from_argparse_arguments',
+    'register_argparse_arguments',
+
+    # auth.conf
+    'get_common_conf_options',
+    'get_plugin_options',
+    'load_from_conf_options',
+    'register_conf_options',
+]
diff --git a/keystoneauth1/auth/__init__.py b/keystoneauth1/auth/__init__.py
deleted file mode 100644
index 703b86f8..00000000
--- a/keystoneauth1/auth/__init__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-
-from keystoneauth1.auth.base import *  # noqa
-from keystoneauth1.auth.cli import *  # noqa
-from keystoneauth1.auth.conf import *  # noqa
-
-
-__all__ = [
-    # auth.base
-    'AUTH_INTERFACE',
-    'BaseAuthPlugin',
-    'get_available_plugin_names',
-    'get_available_plugin_classes',
-    'get_plugin_class',
-    'IDENTITY_AUTH_HEADER_NAME',
-    'PLUGIN_NAMESPACE',
-
-    # auth.cli
-    'load_from_argparse_arguments',
-    'register_argparse_arguments',
-
-    # auth.conf
-    'get_common_conf_options',
-    'get_plugin_options',
-    'load_from_conf_options',
-    'register_conf_options',
-]
diff --git a/keystoneauth1/auth/base.py b/keystoneauth1/base.py
similarity index 100%
rename from keystoneauth1/auth/base.py
rename to keystoneauth1/base.py
diff --git a/keystoneauth1/auth/cli.py b/keystoneauth1/cli.py
similarity index 98%
rename from keystoneauth1/auth/cli.py
rename to keystoneauth1/cli.py
index 1f713940..b27299c9 100644
--- a/keystoneauth1/auth/cli.py
+++ b/keystoneauth1/cli.py
@@ -14,7 +14,7 @@ import argparse
 import os
 
 from keystoneauth1 import _utils as utils
-from keystoneauth1.auth import base
+from keystoneauth1 import base
 
 
 @utils.positional()
diff --git a/keystoneauth1/auth/conf.py b/keystoneauth1/conf.py
similarity index 99%
rename from keystoneauth1/auth/conf.py
rename to keystoneauth1/conf.py
index 138f2c83..1a7b9c25 100644
--- a/keystoneauth1/auth/conf.py
+++ b/keystoneauth1/conf.py
@@ -12,7 +12,7 @@
 
 from oslo_config import cfg
 
-from keystoneauth1.auth import base
+from keystoneauth1 import base
 
 _AUTH_PLUGIN_OPT = cfg.StrOpt('auth_plugin', help='Name of the plugin to load')
 
diff --git a/keystoneauth1/auth/identity/__init__.py b/keystoneauth1/identity/__init__.py
similarity index 83%
rename from keystoneauth1/auth/identity/__init__.py
rename to keystoneauth1/identity/__init__.py
index 1570957d..67e8970e 100644
--- a/keystoneauth1/auth/identity/__init__.py
+++ b/keystoneauth1/identity/__init__.py
@@ -10,10 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystoneauth1.auth.identity import base
-from keystoneauth1.auth.identity import generic
-from keystoneauth1.auth.identity import v2
-from keystoneauth1.auth.identity import v3
+from keystoneauth1.identity import base
+from keystoneauth1.identity import generic
+from keystoneauth1.identity import v2
+from keystoneauth1.identity import v3
 
 
 BaseIdentityPlugin = base.BaseIdentityPlugin
diff --git a/keystoneauth1/auth/identity/access.py b/keystoneauth1/identity/access.py
similarity index 97%
rename from keystoneauth1/auth/identity/access.py
rename to keystoneauth1/identity/access.py
index e3588fde..fde9ea34 100644
--- a/keystoneauth1/auth/identity/access.py
+++ b/keystoneauth1/identity/access.py
@@ -11,7 +11,7 @@
 # under the License.
 
 from keystoneauth1 import _utils as utils
-from keystoneauth1.auth.identity import base
+from keystoneauth1.identity import base
 
 
 class AccessInfoPlugin(base.BaseIdentityPlugin):
diff --git a/keystoneauth1/auth/identity/base.py b/keystoneauth1/identity/base.py
similarity index 99%
rename from keystoneauth1/auth/identity/base.py
rename to keystoneauth1/identity/base.py
index c778891e..8fee3ec6 100644
--- a/keystoneauth1/auth/identity/base.py
+++ b/keystoneauth1/identity/base.py
@@ -17,7 +17,7 @@ from oslo_config import cfg
 import six
 
 from keystoneauth1 import _utils as utils
-from keystoneauth1.auth import base
+from keystoneauth1 import base
 from keystoneauth1 import discover
 from keystoneauth1 import exceptions
 
diff --git a/keystoneauth1/auth/identity/generic/__init__.py b/keystoneauth1/identity/generic/__init__.py
similarity index 74%
rename from keystoneauth1/auth/identity/generic/__init__.py
rename to keystoneauth1/identity/generic/__init__.py
index dc74eedc..51d9f729 100644
--- a/keystoneauth1/auth/identity/generic/__init__.py
+++ b/keystoneauth1/identity/generic/__init__.py
@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystoneauth1.auth.identity.generic.base import BaseGenericPlugin  # noqa
-from keystoneauth1.auth.identity.generic.password import Password  # noqa
-from keystoneauth1.auth.identity.generic.token import Token  # noqa
+from keystoneauth1.identity.generic.base import BaseGenericPlugin  # noqa
+from keystoneauth1.identity.generic.password import Password  # noqa
+from keystoneauth1.identity.generic.token import Token  # noqa
 
 
 __all__ = ['BaseGenericPlugin',
diff --git a/keystoneauth1/auth/identity/generic/base.py b/keystoneauth1/identity/generic/base.py
similarity index 99%
rename from keystoneauth1/auth/identity/generic/base.py
rename to keystoneauth1/identity/generic/base.py
index b684c424..e4e8c6da 100644
--- a/keystoneauth1/auth/identity/generic/base.py
+++ b/keystoneauth1/identity/generic/base.py
@@ -17,9 +17,9 @@ from oslo_config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 
-from keystoneauth1.auth.identity import base
 from keystoneauth1 import discover
 from keystoneauth1 import exceptions
+from keystoneauth1.identity import base
 
 
 LOG = logging.getLogger(__name__)
diff --git a/keystoneauth1/auth/identity/generic/password.py b/keystoneauth1/identity/generic/password.py
similarity index 95%
rename from keystoneauth1/auth/identity/generic/password.py
rename to keystoneauth1/identity/generic/password.py
index a1271c73..c5094293 100644
--- a/keystoneauth1/auth/identity/generic/password.py
+++ b/keystoneauth1/identity/generic/password.py
@@ -15,10 +15,10 @@ import logging
 from oslo_config import cfg
 
 from keystoneauth1 import _utils as utils
-from keystoneauth1.auth.identity.generic import base
-from keystoneauth1.auth.identity import v2
-from keystoneauth1.auth.identity import v3
 from keystoneauth1 import discover
+from keystoneauth1.identity.generic import base
+from keystoneauth1.identity import v2
+from keystoneauth1.identity import v3
 
 LOG = logging.getLogger(__name__)
 
diff --git a/keystoneauth1/auth/identity/generic/token.py b/keystoneauth1/identity/generic/token.py
similarity index 91%
rename from keystoneauth1/auth/identity/generic/token.py
rename to keystoneauth1/identity/generic/token.py
index e1d4620f..635563f9 100644
--- a/keystoneauth1/auth/identity/generic/token.py
+++ b/keystoneauth1/identity/generic/token.py
@@ -14,10 +14,10 @@ import logging
 
 from oslo_config import cfg
 
-from keystoneauth1.auth.identity.generic import base
-from keystoneauth1.auth.identity import v2
-from keystoneauth1.auth.identity import v3
 from keystoneauth1 import discover
+from keystoneauth1.identity.generic import base
+from keystoneauth1.identity import v2
+from keystoneauth1.identity import v3
 
 LOG = logging.getLogger(__name__)
 
diff --git a/keystoneauth1/auth/identity/v2.py b/keystoneauth1/identity/v2.py
similarity index 99%
rename from keystoneauth1/auth/identity/v2.py
rename to keystoneauth1/identity/v2.py
index 4720be69..3f6e8968 100644
--- a/keystoneauth1/auth/identity/v2.py
+++ b/keystoneauth1/identity/v2.py
@@ -18,8 +18,8 @@ import six
 
 from keystoneauth1 import _utils as utils
 from keystoneauth1 import access
-from keystoneauth1.auth.identity import base
 from keystoneauth1 import exceptions
+from keystoneauth1.identity import base
 
 _logger = logging.getLogger(__name__)
 
diff --git a/keystoneauth1/auth/identity/v3/__init__.py b/keystoneauth1/identity/v3/__init__.py
similarity index 73%
rename from keystoneauth1/auth/identity/v3/__init__.py
rename to keystoneauth1/identity/v3/__init__.py
index c883e8a7..b0ab97a7 100644
--- a/keystoneauth1/auth/identity/v3/__init__.py
+++ b/keystoneauth1/identity/v3/__init__.py
@@ -10,11 +10,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystoneauth1.auth.identity.v3.base import *  # noqa
-from keystoneauth1.auth.identity.v3.federation import *  # noqa
-from keystoneauth1.auth.identity.v3.k2k import *  # noqa
-from keystoneauth1.auth.identity.v3.password import *  # noqa
-from keystoneauth1.auth.identity.v3.token import *  # noqa
+from keystoneauth1.identity.v3.base import *  # noqa
+from keystoneauth1.identity.v3.federation import *  # noqa
+from keystoneauth1.identity.v3.k2k import *  # noqa
+from keystoneauth1.identity.v3.password import *  # noqa
+from keystoneauth1.identity.v3.token import *  # noqa
 
 
 __all__ = ['Auth',
diff --git a/keystoneauth1/auth/identity/v3/base.py b/keystoneauth1/identity/v3/base.py
similarity index 99%
rename from keystoneauth1/auth/identity/v3/base.py
rename to keystoneauth1/identity/v3/base.py
index 9fd7947f..c4849f7c 100644
--- a/keystoneauth1/auth/identity/v3/base.py
+++ b/keystoneauth1/identity/v3/base.py
@@ -18,8 +18,8 @@ import six
 
 from keystoneauth1 import _utils as utils
 from keystoneauth1 import access
-from keystoneauth1.auth.identity import base
 from keystoneauth1 import exceptions
+from keystoneauth1.identity import base
 
 _logger = logging.getLogger(__name__)
 
diff --git a/keystoneauth1/auth/identity/v3/federation.py b/keystoneauth1/identity/v3/federation.py
similarity index 97%
rename from keystoneauth1/auth/identity/v3/federation.py
rename to keystoneauth1/identity/v3/federation.py
index 8cf1c027..4c6e1509 100644
--- a/keystoneauth1/auth/identity/v3/federation.py
+++ b/keystoneauth1/identity/v3/federation.py
@@ -15,8 +15,8 @@ import abc
 from oslo_config import cfg
 import six
 
-from keystoneauth1.auth.identity.v3 import base
-from keystoneauth1.auth.identity.v3 import token
+from keystoneauth1.identity.v3 import base
+from keystoneauth1.identity.v3 import token
 
 __all__ = ['FederationBaseAuth']
 
diff --git a/keystoneauth1/auth/identity/v3/k2k.py b/keystoneauth1/identity/v3/k2k.py
similarity index 97%
rename from keystoneauth1/auth/identity/v3/k2k.py
rename to keystoneauth1/identity/v3/k2k.py
index 9dc3f7ab..0acd2f24 100644
--- a/keystoneauth1/auth/identity/v3/k2k.py
+++ b/keystoneauth1/identity/v3/k2k.py
@@ -13,10 +13,10 @@
 from oslo_config import cfg
 
 from keystoneauth1 import access
-from keystoneauth1.auth import base as auth_base
-from keystoneauth1.auth.identity.v3 import base
-from keystoneauth1.auth.identity.v3 import token
+from keystoneauth1 import base as auth_base
 from keystoneauth1 import exceptions
+from keystoneauth1.identity.v3 import base
+from keystoneauth1.identity.v3 import token
 
 __all__ = ['Keystone2Keystone']
 
@@ -30,7 +30,7 @@ class Keystone2Keystone(base.BaseAuth):
 
     :param base_plugin: Auth plugin already authenticated against the keystone
                         IdP.
-    :type base_plugin: ``keystoneauth1.auth.v3.base.BaseAuth``
+    :type base_plugin: ``keystoneauth1.v3.base.BaseAuth``
 
     :param service_provider: The Service Provider ID.
     :type service_provider: string
diff --git a/keystoneauth1/auth/identity/v3/password.py b/keystoneauth1/identity/v3/password.py
similarity index 98%
rename from keystoneauth1/auth/identity/v3/password.py
rename to keystoneauth1/identity/v3/password.py
index a22c420f..100ce765 100644
--- a/keystoneauth1/auth/identity/v3/password.py
+++ b/keystoneauth1/identity/v3/password.py
@@ -12,7 +12,7 @@
 
 from oslo_config import cfg
 
-from keystoneauth1.auth.identity.v3 import base
+from keystoneauth1.identity.v3 import base
 
 
 __all__ = ['PasswordMethod', 'Password']
diff --git a/keystoneauth1/auth/identity/v3/token.py b/keystoneauth1/identity/v3/token.py
similarity index 97%
rename from keystoneauth1/auth/identity/v3/token.py
rename to keystoneauth1/identity/v3/token.py
index 861a2380..89e7f89c 100644
--- a/keystoneauth1/auth/identity/v3/token.py
+++ b/keystoneauth1/identity/v3/token.py
@@ -12,7 +12,7 @@
 
 from oslo_config import cfg
 
-from keystoneauth1.auth.identity.v3 import base
+from keystoneauth1.identity.v3 import base
 
 
 __all__ = ['TokenMethod', 'Token']
diff --git a/keystoneauth1/tests/unit/auth/test_access.py b/keystoneauth1/tests/unit/auth/test_access.py
index 7e866760..1c1803ce 100644
--- a/keystoneauth1/tests/unit/auth/test_access.py
+++ b/keystoneauth1/tests/unit/auth/test_access.py
@@ -13,9 +13,9 @@
 import uuid
 
 from keystoneauth1 import access
-from keystoneauth1 import auth
-from keystoneauth1.auth.identity import access as access_plugin
+from keystoneauth1 import base
 from keystoneauth1 import fixture
+from keystoneauth1.identity import access as access_plugin
 from keystoneauth1 import session
 from keystoneauth1.tests.unit import utils
 
@@ -49,7 +49,7 @@ class AccessInfoPluginTests(utils.TestCase):
 
         self.assertEqual(auth_url,
                          plugin.get_endpoint(self.session,
-                                             interface=auth.AUTH_INTERFACE))
+                                             interface=base.AUTH_INTERFACE))
 
     def test_invalidate(self):
         plugin = self._plugin()
diff --git a/keystoneauth1/tests/unit/auth/test_cli.py b/keystoneauth1/tests/unit/auth/test_cli.py
index f2cbde40..912dcfed 100644
--- a/keystoneauth1/tests/unit/auth/test_cli.py
+++ b/keystoneauth1/tests/unit/auth/test_cli.py
@@ -17,8 +17,8 @@ import fixtures
 import mock
 from oslo_config import cfg
 
-from keystoneauth1.auth import base
-from keystoneauth1.auth import cli
+from keystoneauth1 import base
+from keystoneauth1 import cli
 from keystoneauth1.tests.unit.auth import utils
 
 
diff --git a/keystoneauth1/tests/unit/auth/test_conf.py b/keystoneauth1/tests/unit/auth/test_conf.py
index 4adc07db..9f49ad5e 100644
--- a/keystoneauth1/tests/unit/auth/test_conf.py
+++ b/keystoneauth1/tests/unit/auth/test_conf.py
@@ -17,11 +17,11 @@ from oslo_config import cfg
 from oslo_config import fixture as config
 import stevedore
 
-from keystoneauth1.auth import base
-from keystoneauth1.auth import conf
-from keystoneauth1.auth.identity import v2 as v2_auth
-from keystoneauth1.auth.identity import v3 as v3_auth
+from keystoneauth1 import base
+from keystoneauth1 import conf
 from keystoneauth1 import exceptions
+from keystoneauth1.identity import v2 as v2_auth
+from keystoneauth1.identity import v3 as v3_auth
 from keystoneauth1.tests.unit.auth import utils
 
 
diff --git a/keystoneauth1/tests/unit/auth/test_identity_common.py b/keystoneauth1/tests/unit/auth/test_identity_common.py
index d3e233f1..dfc2dd83 100644
--- a/keystoneauth1/tests/unit/auth/test_identity_common.py
+++ b/keystoneauth1/tests/unit/auth/test_identity_common.py
@@ -18,10 +18,10 @@ import six
 
 from keystoneauth1 import _utils
 from keystoneauth1 import access
-from keystoneauth1.auth import base
-from keystoneauth1.auth import identity
+from keystoneauth1 import base
 from keystoneauth1 import exceptions
 from keystoneauth1 import fixture
+from keystoneauth1 import identity
 from keystoneauth1 import session
 from keystoneauth1.tests.unit import utils
 
diff --git a/keystoneauth1/tests/unit/auth/test_identity_v2.py b/keystoneauth1/tests/unit/auth/test_identity_v2.py
index bdab06ac..e6f4a970 100644
--- a/keystoneauth1/tests/unit/auth/test_identity_v2.py
+++ b/keystoneauth1/tests/unit/auth/test_identity_v2.py
@@ -13,8 +13,8 @@
 import copy
 import uuid
 
-from keystoneauth1.auth.identity import v2
 from keystoneauth1 import exceptions
+from keystoneauth1.identity import v2
 from keystoneauth1 import session
 from keystoneauth1.tests.unit import utils
 
diff --git a/keystoneauth1/tests/unit/auth/test_identity_v3.py b/keystoneauth1/tests/unit/auth/test_identity_v3.py
index a04162fc..bde5fafe 100644
--- a/keystoneauth1/tests/unit/auth/test_identity_v3.py
+++ b/keystoneauth1/tests/unit/auth/test_identity_v3.py
@@ -14,10 +14,10 @@ import copy
 import uuid
 
 from keystoneauth1 import access
-from keystoneauth1.auth.identity import v3
-from keystoneauth1.auth.identity.v3 import base as v3_base
 from keystoneauth1 import exceptions
 from keystoneauth1 import fixture
+from keystoneauth1.identity import v3
+from keystoneauth1.identity.v3 import base as v3_base
 from keystoneauth1 import session
 from keystoneauth1.tests.unit import utils
 
diff --git a/keystoneauth1/tests/unit/auth/test_identity_v3_federation.py b/keystoneauth1/tests/unit/auth/test_identity_v3_federation.py
index fc35b7ea..55570757 100644
--- a/keystoneauth1/tests/unit/auth/test_identity_v3_federation.py
+++ b/keystoneauth1/tests/unit/auth/test_identity_v3_federation.py
@@ -16,9 +16,9 @@ import uuid
 import six
 
 from keystoneauth1 import access
-from keystoneauth1.auth.identity import v3
 from keystoneauth1 import exceptions
 from keystoneauth1 import fixture
+from keystoneauth1.identity import v3
 from keystoneauth1 import session
 from keystoneauth1.tests.unit import k2k_fixtures
 from keystoneauth1.tests.unit import utils
diff --git a/keystoneauth1/tests/unit/auth/test_password.py b/keystoneauth1/tests/unit/auth/test_password.py
index 9bb89311..22b4e866 100644
--- a/keystoneauth1/tests/unit/auth/test_password.py
+++ b/keystoneauth1/tests/unit/auth/test_password.py
@@ -12,10 +12,10 @@
 
 import uuid
 
-from keystoneauth1.auth.identity.generic import password
-from keystoneauth1.auth.identity import v2
-from keystoneauth1.auth.identity import v3
-from keystoneauth1.auth.identity.v3 import password as v3_password
+from keystoneauth1.identity.generic import password
+from keystoneauth1.identity import v2
+from keystoneauth1.identity import v3
+from keystoneauth1.identity.v3 import password as v3_password
 from keystoneauth1.tests.unit.auth import utils
 
 
diff --git a/keystoneauth1/tests/unit/auth/test_token.py b/keystoneauth1/tests/unit/auth/test_token.py
index 56470670..25a717c6 100644
--- a/keystoneauth1/tests/unit/auth/test_token.py
+++ b/keystoneauth1/tests/unit/auth/test_token.py
@@ -12,10 +12,10 @@
 
 import uuid
 
-from keystoneauth1.auth.identity.generic import token
-from keystoneauth1.auth.identity import v2
-from keystoneauth1.auth.identity import v3
-from keystoneauth1.auth.identity.v3 import token as v3_token
+from keystoneauth1.identity.generic import token
+from keystoneauth1.identity import v2
+from keystoneauth1.identity import v3
+from keystoneauth1.identity.v3 import token as v3_token
 from keystoneauth1.tests.unit.auth import utils
 
 
diff --git a/keystoneauth1/tests/unit/auth/test_token_endpoint.py b/keystoneauth1/tests/unit/auth/test_token_endpoint.py
index 28050ee0..0824c9b1 100644
--- a/keystoneauth1/tests/unit/auth/test_token_endpoint.py
+++ b/keystoneauth1/tests/unit/auth/test_token_endpoint.py
@@ -12,9 +12,9 @@
 
 from testtools import matchers
 
-from keystoneauth1.auth import token_endpoint
 from keystoneauth1 import session
 from keystoneauth1.tests.unit import utils
+from keystoneauth1 import token_endpoint
 
 
 class TokenEndpointTest(utils.TestCase):
diff --git a/keystoneauth1/tests/unit/auth/utils.py b/keystoneauth1/tests/unit/auth/utils.py
index 6bace5ed..a4a363fb 100644
--- a/keystoneauth1/tests/unit/auth/utils.py
+++ b/keystoneauth1/tests/unit/auth/utils.py
@@ -18,7 +18,7 @@ from oslo_config import cfg
 import six
 
 from keystoneauth1 import access
-from keystoneauth1.auth import base
+from keystoneauth1 import base
 from keystoneauth1 import exceptions
 from keystoneauth1 import fixture
 from keystoneauth1 import session
diff --git a/keystoneauth1/tests/unit/test_session.py b/keystoneauth1/tests/unit/test_session.py
index dd5aed01..1ac50e1a 100644
--- a/keystoneauth1/tests/unit/test_session.py
+++ b/keystoneauth1/tests/unit/test_session.py
@@ -24,7 +24,7 @@ import six
 from testtools import matchers
 
 from keystoneauth1 import adapter
-from keystoneauth1.auth import base
+from keystoneauth1 import base
 from keystoneauth1 import exceptions
 from keystoneauth1 import session as client_session
 from keystoneauth1.tests.unit import utils
diff --git a/keystoneauth1/auth/token_endpoint.py b/keystoneauth1/token_endpoint.py
similarity index 97%
rename from keystoneauth1/auth/token_endpoint.py
rename to keystoneauth1/token_endpoint.py
index 6547fafe..642c26d8 100644
--- a/keystoneauth1/auth/token_endpoint.py
+++ b/keystoneauth1/token_endpoint.py
@@ -12,7 +12,7 @@
 
 from oslo_config import cfg
 
-from keystoneauth1.auth import base
+from keystoneauth1 import base
 
 
 class Token(base.BaseAuthPlugin):
diff --git a/setup.cfg b/setup.cfg
index 32be39de..92869ccb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,13 +26,13 @@ packages =
 [entry_points]
 
 keystoneauth1.auth.plugin =
-    password = keystoneauth1.auth.identity.generic:Password
-    token = keystoneauth1.auth.identity.generic:Token
-    v2password = keystoneauth1.auth.identity.v2:Password
-    v2token = keystoneauth1.auth.identity.v2:Token
-    v3password = keystoneauth1.auth.identity.v3:Password
-    v3token = keystoneauth1.auth.identity.v3:Token
-    k2k = keystoneauth1.auth.identity.v3:Keystone2Keystone
+    password = keystoneauth1.identity.generic:Password
+    token = keystoneauth1.identity.generic:Token
+    v2password = keystoneauth1.identity.v2:Password
+    v2token = keystoneauth1.identity.v2:Token
+    v3password = keystoneauth1.identity.v3:Password
+    v3token = keystoneauth1.identity.v3:Token
+    k2k = keystoneauth1.identity.v3:Keystone2Keystone
 
 [build_sphinx]
 source-dir = doc/source