openstack/python-watcherclient
Code Issues Proposed changes

Use keystoneauth instead of keystoneclient

Browse Source 
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
This commit is contained in:
Jeremy Liu
2017-01-13 16:14:03 +08:00
parent 17a144e2f8
commit a2cbb8d4b2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -9,6 +9,6 @@ oslo.i18n>=2.1.0 # Apache-2.0
oslo.utils>=3.18.0 # Apache-2.0 oslo.utils>=3.18.0 # Apache-2.0
pbr>=1.8 # Apache-2.0 pbr>=1.8 # Apache-2.0
PrettyTable<0.8,>=0.7.1 # BSD 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 six>=1.9.0 # MIT
PyYAML>=3.10.0 # MIT PyYAML>=3.10.0 # MIT

4
watcherclient/shell.py
View File

@@ -25,7 +25,7 @@ from cliff import command
from cliff import commandmanager from cliff import commandmanager
from cliff import complete from cliff import complete
from cliff import help as cli_help from cliff import help as cli_help
from keystoneclient import session from keystoneauth1 import loading
from osc_lib import logs from osc_lib import logs
from osc_lib import utils from osc_lib import utils
@@ -165,7 +165,7 @@ class WatcherShell(app.App):
"Service Catalog.") "Service Catalog.")
parser.epilog = ('See "watcher help COMMAND" for help ' parser.epilog = ('See "watcher help COMMAND" for help '
'on a specific command.') 'on a specific command.')
session.Session.register_cli_options(parser) loading.register_session_argparse_arguments(parser)
return parser return parser
def configure_logging(self): def configure_logging(self):

4
watcherclient/tests/keystone_client_fixtures.py
View File

@@ -13,8 +13,8 @@
import json import json
from oslo_utils import uuidutils from oslo_utils import uuidutils
from keystoneclient.fixture import v2 as ks_v2_fixture from keystoneauth1.fixture import v2 as ks_v2_fixture
from keystoneclient.fixture import v3 as ks_v3_fixture from keystoneauth1.fixture import v3 as ks_v3_fixture
# these are copied from python-keystoneclient tests # these are copied from python-keystoneclient tests
BASE_HOST = 'http://keystone.example.com' BASE_HOST = 'http://keystone.example.com'