diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-18 19:41:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-18 19:41:31 +0000 |
| commit | 20bb32f8d8272aee14f8e349fe1a0536c1c8ab68 (patch) | |
| tree | f413fa9c38844bb9ea7b354efb6250e2470aa458 /functionaltests | |
| parent | e16a6f5c44b112a1d39be2611ff9c6781a010bb7 (diff) | |
| parent | 274b91a72306aefce4c0001db676de86dc48b52b (diff) | |
| download | python-barbicanclient-20bb32f8d8272aee14f8e349fe1a0536c1c8ab68.tar.gz | |
Merge "Use keystoneauth"
Diffstat (limited to 'functionaltests')
| -rw-r--r-- | functionaltests/client/base.py | 4 | ||||
| -rw-r--r-- | functionaltests/client/test_client_connectivity.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/functionaltests/client/base.py b/functionaltests/client/base.py index 3eb3cb6..f408f1f 100644 --- a/functionaltests/client/base.py +++ b/functionaltests/client/base.py @@ -18,8 +18,8 @@ import logging from functionaltests.base import BaseTestCase from functionaltests.common import config from barbicanclient import client -from keystoneclient.auth import identity -from keystoneclient import session +from keystoneauth1 import identity +from keystoneauth1 import session CONF = config.get_config() diff --git a/functionaltests/client/test_client_connectivity.py b/functionaltests/client/test_client_connectivity.py index 217dc33..a734342 100644 --- a/functionaltests/client/test_client_connectivity.py +++ b/functionaltests/client/test_client_connectivity.py @@ -18,9 +18,9 @@ from functionaltests.base import BaseTestCase from functionaltests.common import config from barbicanclient import client from barbicanclient import exceptions -from keystoneclient.auth import identity -from keystoneclient import session -from keystoneclient import exceptions as ks_exceptions +from keystoneauth1 import identity +from keystoneauth1 import session +from keystoneauth1 import exceptions as ks_exceptions CONF = config.get_config() |