openstack
/
keystone
Code Issues Proposed changes

Merge "Remove deprecated auth_token middleware"

This commit is contained in:
Jenkins 2013-11-27 07:46:23 +00:00 committed by Gerrit Code Review
parent 76a34a6a33 2cdc7dcc22
commit 571ffb58e8
2 changed files with 0 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
keystone/middleware/auth_token.py
View File

@ -1,33 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010-2012 OpenStack Foundation
#
# 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.
"""
The actual code for auth_token has now been moved python-keystoneclient. It is
imported back here to ensure backward combatibility for old paste.ini files
that might still refer to here as opposed to keystoneclient
"""
from keystoneclient.middleware import auth_token as client_auth_token
will_expire_soon = client_auth_token.will_expire_soon
InvalidUserToken = client_auth_token.InvalidUserToken
ServiceError = client_auth_token.ServiceError
ConfigurationError = client_auth_token.ConfigurationError
AuthProtocol = client_auth_token.AuthProtocol
filter_factory = client_auth_token.filter_factory
app_factory = client_auth_token.app_factory

41
keystone/tests/_test_import_auth_token.py
View File

@ -1,41 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 OpenStack Foundation
#
# 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.
"""This is an isolated test to prevent unexpected imports.
This module must be run in isolation, e.g.:
$ ./run_tests.sh _test_import_auth_token.py
This module can be removed when keystone.middleware.auth_token is removed.
"""
import testtools
class TestAuthToken(testtools.TestCase):
def test_import(self):
# a consuming service like nova would import oslo.config first
from oslo.config import cfg
conf = cfg.CONF
# define some config options
conf.register_opt(cfg.BoolOpt('debug', default=False))
# and then import auth_token as a filter
from keystone.middleware import auth_token
self.assertTrue(auth_token)