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

@@ -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',
+]

keystoneauth1/auth/__init__.py

@@ -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',
-]

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()

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')
 

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

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):

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
 

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',

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__)

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__)
 

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__)
 

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__)
 

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',

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__)
 

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']
 

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

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']

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']

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()

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
 
 

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
 
 

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
 

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
 

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
 

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

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
 
 

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
 
 

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):

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

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

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):

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