From 2dd894c7117d2d8ebf0f7ae365de49b3b3b1a078 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Thu, 27 Nov 2014 06:37:23 +0800 Subject: Support ceilometer-url and os-endpoint Ceilometerclient has messed up with (ceilometer-url and os-endpoint) and (os-auth-token and token). This patch marks ceilometer-url and auth-token as deprecated, and unifies the two pairs arguments. Change-Id: Id55e5b603d8075018cf45b9833d397173439b3ce Closes-Bug: #1396811 --- ceilometerclient/shell.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'ceilometerclient/shell.py') diff --git a/ceilometerclient/shell.py b/ceilometerclient/shell.py index 5bfe1d5..221eca9 100644 --- a/ceilometerclient/shell.py +++ b/ceilometerclient/shell.py @@ -81,11 +81,14 @@ class CeilometerShell(object): type=_positive_non_zero_int, help='Number of seconds to wait for a response.') - parser.add_argument('--ceilometer-url', + parser.add_argument('--ceilometer-url', metavar='', + dest='os_endpoint', default=cliutils.env('CEILOMETER_URL'), - help='Defaults to env[CEILOMETER_URL].') + help=("DEPRECATED, use --os-endpoint instead. " + "Defaults to env[CEILOMETER_URL].")) parser.add_argument('--ceilometer_url', + dest='os_endpoint', help=argparse.SUPPRESS) parser.add_argument('--ceilometer-api-version', @@ -155,7 +158,7 @@ class CeilometerShell(object): def parse_args(self, argv): # Parse args once to find version - self.auth_plugin = ceiloclient.AuthPlugin(argv) + self.auth_plugin = ceiloclient.AuthPlugin() parser = self.get_base_parser() (options, args) = parser.parse_known_args(argv) self.auth_plugin.parse_opts(options) @@ -198,7 +201,9 @@ class CeilometerShell(object): self.do_bash_completion(args) return 0 - if not (self.auth_plugin.opts['auth_token'] and args.ceilometer_url): + if not ((self.auth_plugin.opts.get('token') + or self.auth_plugin.opts.get('auth_token')) + and self.auth_plugin.opts['endpoint']): if not self.auth_plugin.opts['username']: raise exc.CommandError("You must provide a username via " "either --os-username or via " -- cgit v1.2.1