summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-13 07:37:40 +0000
committerGerrit Code Review <review@openstack.org>2016-01-13 07:37:40 +0000
commit23db4d301d9fb8094aa3b7bf3bb10cb1731259ff (patch)
treed4aa174a6a48004559fd8d93555ce571f2ed75ec
parent9d4077c09dd0e7d83951c440c434d85b30b71361 (diff)
parent9911497290de9239440c4f1080f08a9b217ff0f5 (diff)
downloadkeystonemiddleware-23db4d301d9fb8094aa3b7bf3bb10cb1731259ff.tar.gz
Merge "Revert "Stop using private keystoneclient functions""
-rw-r--r--keystonemiddleware/fixture.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/keystonemiddleware/fixture.py b/keystonemiddleware/fixture.py
index a6e921b..18fbb47 100644
--- a/keystonemiddleware/fixture.py
+++ b/keystonemiddleware/fixture.py
@@ -15,6 +15,7 @@ import uuid
import fixtures
from keystoneauth1 import fixture as client_fixtures
+from keystoneclient import utils
from oslo_utils import timeutils
from keystonemiddleware import auth_token
@@ -42,6 +43,7 @@ class AuthTokenFixture(fixtures.Fixture):
def tokens(self):
return self._token_data.keys()
+ @utils.positional(1)
def add_token_data(self, token_id=None, expires=None, user_id=None,
user_name=None, user_domain_id=None,
user_domain_name=None, project_id=None,