use keystoneauth instead of keystoneclient

as part of deprecating this package we should use keystoneauth
instead of keystoneclient auth plugins and fixtures.

Change-Id: I9c0169018aefd6df9d406da7ce9256205834674e
This commit is contained in:
Steve Martinelli 2016-03-09 05:10:35 -05:00
parent dab55e454d
commit 854fa3c9b9
5 changed files with 9 additions and 9 deletions

View File

@ -12,8 +12,8 @@
import uuid
from keystoneclient import fixture as ks_fixture
from keystoneclient import session
from keystoneauth1 import fixture as ks_fixture
from keystoneauth1 import session
from keystoneclient_kerberos.tests import base
from keystoneclient_kerberos import v3

View File

@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from keystoneclient import session
from keystoneauth1 import session
from keystoneclient_kerberos.tests import base
from keystoneclient_kerberos import v3

View File

@ -13,7 +13,7 @@
import uuid
import fixtures
from keystoneclient import fixture as ks_fixture
from keystoneauth1 import fixture as ks_fixture
from oslotest import mockpatch
import requests_kerberos

View File

@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from keystoneclient import access
from keystoneclient.auth.identity import v3
from keystoneauth1 import access
from keystoneauth1.identity import v3
import requests_kerberos
@ -38,7 +38,7 @@ class Kerberos(v3.AuthConstructor):
_auth_method_class = KerberosMethod
class FederatedKerberos(v3.FederatedBaseAuth):
class FederatedKerberos(v3.FederationBaseAuth):
"""Authenticate using Kerberos via the keystone federation mechanisms.
This is not technically federation. However, federation is the term which
@ -52,4 +52,4 @@ class FederatedKerberos(v3.FederatedBaseAuth):
requests_auth=_requests_auth(),
authenticated=False)
return access.AccessInfo.factory(body=resp.json(), resp=resp)
return access.create(body=resp.json(), resp=resp)

View File

@ -3,5 +3,5 @@
# process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0
python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
keystoneauth1[kerberos]>=2.1.0 # Apache-2.0
requests-kerberos>=0.6;python_version=='2.7' or python_version=='2.6' # MIT