Revert "Stop using private keystoneclient functions"

This reverts commit 96f6668a27.

Whilst in theory I agree we don't want to expose this many positional
arguments. This is exactly what positional is supposed to be used for.

I'm happy to have the debate as to where we can make @positional
publically available from but for now (and follow up patch) let's keep
it.

Change-Id: Idd07e49370597b63c0e49b56843266a7014a0e65

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,