openstack/deb-mistral
Code Issues Proposed changes

Use keystonemiddleware in place of keystoneclient

Browse Source 
keystoneclient.middleware has been deprecated in
favor of keystonemiddleware

Change-Id: I8bb2e8ae453027334ea7303ba87cbf8000b27994
Closes-Bug: #1377822
This commit is contained in:
Abhishek Chanda 2014-10-07 13:54:58 -07:00
parent 4a038c2711
commit 258fd15ca8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mistral/api/access_control.py
View File

@ -16,7 +16,7 @@
"""Access Control API server.""" """Access Control API server."""
from keystoneclient.middleware import auth_token from keystonemiddleware import auth_token
from oslo.config import cfg from oslo.config import cfg

4
mistral/tests/unit/api/test_auth.py
View File

@ -15,7 +15,7 @@
import datetime import datetime
import uuid import uuid
from keystoneclient.middleware import auth_token from keystonemiddleware import auth_token
import mock import mock
from oslo.config import cfg from oslo.config import cfg
import pecan import pecan
@ -88,7 +88,7 @@ class TestKeystoneMiddleware(base.FunctionalTest):
auth_token.AuthProtocol, '_get_user_token_from_header', auth_token.AuthProtocol, '_get_user_token_from_header',
mock.MagicMock(return_value='')) mock.MagicMock(return_value=''))
@mock.patch.object( @mock.patch.object(
auth_token.AuthProtocol, '_validate_user_token', auth_token.AuthProtocol, '_validate_token',
mock.MagicMock(return_value=PKI_TOKEN_VERIFIED)) mock.MagicMock(return_value=PKI_TOKEN_VERIFIED))
@mock.patch.object( @mock.patch.object(
db_api, "workbook_get", db_api, "workbook_get",

1
requirements.txt
View File

@ -27,3 +27,4 @@ stevedore>=1.0.0 # Apache-2.0
yaql==0.2.1 # This is not in global requirements yaql==0.2.1 # This is not in global requirements
jsonschema>=2.0.0,<3.0.0 jsonschema>=2.0.0,<3.0.0
mock>=1.0 mock>=1.0
keystonemiddleware>=1.0.0