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 /barbicanclient | |
| parent | e16a6f5c44b112a1d39be2611ff9c6781a010bb7 (diff) | |
| parent | 274b91a72306aefce4c0001db676de86dc48b52b (diff) | |
| download | python-barbicanclient-20bb32f8d8272aee14f8e349fe1a0536c1c8ab68.tar.gz | |
Merge "Use keystoneauth"
Diffstat (limited to 'barbicanclient')
| -rw-r--r-- | barbicanclient/barbican.py | 9 | ||||
| -rw-r--r-- | barbicanclient/client.py | 4 | ||||
| -rw-r--r-- | barbicanclient/tests/test_client.py | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/barbicanclient/barbican.py b/barbicanclient/barbican.py index 1aa505f..e35a7e2 100644 --- a/barbicanclient/barbican.py +++ b/barbicanclient/barbican.py @@ -26,9 +26,10 @@ from cliff import command from cliff import commandmanager from cliff import complete from cliff import help -from keystoneclient.auth.identity import v3 -from keystoneclient.auth.identity import v2 -from keystoneclient import session +from keystoneauth1.identity import v2 +from keystoneauth1.identity import v3 +from keystoneauth1 import loading +from keystoneauth1 import session import six from barbicanclient import client @@ -318,7 +319,7 @@ class Barbican(app.App): help='Defaults to env[BARBICAN_API_VERSION].') parser.epilog = ('See "barbican help COMMAND" for help ' 'on a specific command.') - session.Session.register_cli_options(parser) + loading.register_session_argparse_arguments(parser) return parser def prepare_to_run_command(self, cmd): diff --git a/barbicanclient/client.py b/barbicanclient/client.py index 17fabbb..d47b764 100644 --- a/barbicanclient/client.py +++ b/barbicanclient/client.py @@ -16,8 +16,8 @@ import json import logging import os -from keystoneclient import adapter -from keystoneclient import session as ks_session +from keystoneauth1 import adapter +from keystoneauth1 import session as ks_session from barbicanclient import acls from barbicanclient import cas diff --git a/barbicanclient/tests/test_client.py b/barbicanclient/tests/test_client.py index 20f5e42..c4a2033 100644 --- a/barbicanclient/tests/test_client.py +++ b/barbicanclient/tests/test_client.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from keystoneclient import session +from keystoneauth1 import session import mock from requests_mock.contrib import fixture import testtools |