From a2cbb8d4b2ee4373ce3d576e0cbe8c9eb0c0fa40 Mon Sep 17 00:00:00 2001
From: Jeremy Liu <liujiong@gohighsec.com>
Date: Fri, 13 Jan 2017 16:14:03 +0800
Subject: [PATCH] Use keystoneauth instead of keystoneclient

keystoneauth was extracted from keystoneclient, this CR replaces usage
of keystoneclient in favor of keystoneauth.

Implements: blueprint use-keystoneauth-instead-of-keystoneclient
Change-Id: Iada0f8b45ae30a89908a4ae9e5f55a33e3744e17
---
 requirements.txt                                | 2 +-
 watcherclient/shell.py                          | 4 ++--
 watcherclient/tests/keystone_client_fixtures.py | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index d0b1cbc..8afc74a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,6 @@ oslo.i18n>=2.1.0 # Apache-2.0
 oslo.utils>=3.18.0 # Apache-2.0
 pbr>=1.8 # Apache-2.0
 PrettyTable<0.8,>=0.7.1 # BSD
-python-keystoneclient>=3.8.0 # Apache-2.0
+keystoneauth1>=2.16.0 # Apache-2.0
 six>=1.9.0 # MIT
 PyYAML>=3.10.0 # MIT
diff --git a/watcherclient/shell.py b/watcherclient/shell.py
index 2f631ab..cd93204 100644
--- a/watcherclient/shell.py
+++ b/watcherclient/shell.py
@@ -25,7 +25,7 @@ from cliff import command
 from cliff import commandmanager
 from cliff import complete
 from cliff import help as cli_help
-from keystoneclient import session
+from keystoneauth1 import loading
 from osc_lib import logs
 from osc_lib import utils
 
@@ -165,7 +165,7 @@ class WatcherShell(app.App):
                                  "Service Catalog.")
         parser.epilog = ('See "watcher help COMMAND" for help '
                          'on a specific command.')
-        session.Session.register_cli_options(parser)
+        loading.register_session_argparse_arguments(parser)
         return parser
 
     def configure_logging(self):
diff --git a/watcherclient/tests/keystone_client_fixtures.py b/watcherclient/tests/keystone_client_fixtures.py
index a175d7f..562de76 100644
--- a/watcherclient/tests/keystone_client_fixtures.py
+++ b/watcherclient/tests/keystone_client_fixtures.py
@@ -13,8 +13,8 @@
 import json
 from oslo_utils import uuidutils
 
-from keystoneclient.fixture import v2 as ks_v2_fixture
-from keystoneclient.fixture import v3 as ks_v3_fixture
+from keystoneauth1.fixture import v2 as ks_v2_fixture
+from keystoneauth1.fixture import v3 as ks_v3_fixture
 
 # these are copied from python-keystoneclient tests
 BASE_HOST = 'http://keystone.example.com'