diff options
| -rw-r--r-- | ceilometerclient/client.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/v1/meters.py | 14 | ||||
| -rw-r--r-- | ceilometerclient/v2/options.py | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index feacf7c..a0fbae2 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -49,7 +49,7 @@ def _discover_auth_versions(session, auth_url): raise exc.CommandError('Unable to determine the Keystone ' 'version to authenticate with ' 'using the given auth_url.') - return (v2_auth_url, v3_auth_url) + return v2_auth_url, v3_auth_url def _get_keystone_session(**kwargs): diff --git a/ceilometerclient/v1/meters.py b/ceilometerclient/v1/meters.py index e9cc790..c8a784b 100644 --- a/ceilometerclient/v1/meters.py +++ b/ceilometerclient/v1/meters.py @@ -51,7 +51,7 @@ class UserManager(base.Manager): def list(self, **kwargs): s = kwargs.get('source') if s: - path = '/sources/%s/users' % (s) + path = '/sources/%s/users' % s else: path = '/users' return self._list('/v1%s' % path, 'users') @@ -100,17 +100,17 @@ class ResourceManager(base.Manager): opts_path = _get_opt_path(['start_timestamp', 'end_timestamp'], **kwargs) if u: - path = '/users/%s/resources' % (u) + path = '/users/%s/resources' % u elif s: - path = '/sources/%s/resources' % (s) + path = '/sources/%s/resources' % s elif p: - path = '/projects/%s/resources' % (p) + path = '/projects/%s/resources' % p else: path = '/resources' if opts_path: path = '/v1%s?%s' % (path, opts_path) else: - path = '/v1%s' % (path) + path = '/v1%s' % path return self._list(path, 'resources') @@ -152,7 +152,7 @@ class SampleManager(base.Manager): if opts_path: path = '/v1%s?%s' % (path, opts_path) else: - path = '/v1%s' % (path) + path = '/v1%s' % path return self._list(path, 'events') @@ -186,5 +186,5 @@ class MeterManager(base.Manager): if opts_path: path = '/v1%s?%s' % (path, opts_path) else: - path = '/v1%s' % (path) + path = '/v1%s' % path return self._list(path, 'meters') diff --git a/ceilometerclient/v2/options.py b/ceilometerclient/v2/options.py index ee85c42..e16013c 100644 --- a/ceilometerclient/v2/options.py +++ b/ceilometerclient/v2/options.py @@ -99,7 +99,7 @@ def cli_to_array(cli_query): if not len(value): _value_error('value') - return (field, operator, value) + return field, operator, value def split_by_data_type(query_value): frags = DATA_TYPE_RE.match(query_value) |