OpenDev Migration Patch

This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.

.coveragerc

@@ -9,4 +9,4 @@ omit =
     cloudkittyclient/common/exceptions.py
 
 [report]
-ignore-errors = True
+ignore_errors = True

.gitreview

@@ -1,4 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
-project=stackforge/python-cloudkittyclient.git
+project=openstack/python-cloudkittyclient.git
+defaultbranch=stable/newton

MANIFEST.in

@@ -1,6 +0,0 @@
-include AUTHORS
-include ChangeLog
-exclude .gitignore
-exclude .gitreview
-
-global-exclude *.pyc

cloudkittyclient/client.py

@@ -10,6 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import contextlib
+import time
+
+from keystoneclient import adapter
 from keystoneclient.auth.identity import v2 as v2_auth
 from keystoneclient.auth.identity import v3 as v3_auth
 from keystoneclient import discover
@@ -21,6 +25,7 @@ import six.moves.urllib.parse as urlparse
 from cloudkittyclient.common import utils
 from cloudkittyclient import exc
 from cloudkittyclient.openstack.common.apiclient import auth
+from cloudkittyclient.openstack.common.apiclient import client
 from cloudkittyclient.openstack.common.apiclient import exceptions
 
 
@@ -105,6 +110,8 @@ def _get_keystone_session(**kwargs):
             user_id=user_id,
             user_domain_name=user_domain_name,
             user_domain_id=user_domain_id,
+            project_name=project_name,
+            project_id=project_id,
             project_domain_name=project_domain_name,
             project_domain_id=project_domain_id)
     elif use_v2:
@@ -145,7 +152,8 @@ class AuthPlugin(auth.BaseAuthPlugin):
                  'service_type', 'endpoint_type', 'cacert',
                  'auth_url', 'insecure', 'cert_file', 'key_file',
                  'cert', 'key', 'tenant_name', 'project_name',
-                 'project_id', 'user_domain_id', 'user_domain_name',
+                 'project_id', 'project_domain_id', 'project_domain_name',
+                 'user_id', 'user_domain_id', 'user_domain_name',
                  'password', 'username', 'endpoint']
 
     def __init__(self, auth_system=None, **kwargs):
@@ -200,8 +208,13 @@ class AuthPlugin(auth.BaseAuthPlugin):
         """
         has_token = self.opts.get('token') or self.opts.get('auth_token')
         no_auth = has_token and self.opts.get('endpoint')
+        has_project = (self.opts.get('project_id')
+                       or (self.opts.get('project_name')
+                           and (self.opts.get('user_domain_name')
+                           or self.opts.get('user_domain_id'))))
         has_tenant = self.opts.get('tenant_id') or self.opts.get('tenant_name')
-        has_credential = (self.opts.get('username') and has_tenant
+        has_credential = (self.opts.get('username')
+                          and (has_project or has_tenant)
                           and self.opts.get('password')
                           and self.opts.get('auth_url'))
         missing = not (no_auth or has_credential)
@@ -250,9 +263,28 @@ def get_client(version, **kwargs):
     :param api_version: the API version to use ('1')
     :param kwargs: keyword args containing credentials, either:
 
+            * session: a keystoneauth/keystoneclient session object
+            * service_type: The default service_type for URL discovery
+            * service_name: The default service_name for URL discovery
+            * interface: The default interface for URL discovery
+                         (Default: public)
+            * region_name: The default region_name for URL discovery
+            * endpoint_override: Always use this endpoint URL for requests
+                                 for this cloudkittyclient
+            * auth: An auth plugin to use instead of the session one
+            * user_agent: The User-Agent string to set
+                          (Default is python-cloudkittyclient)
+            * connect_retries: the maximum number of retries that should be
+                               attempted for connection errors
+            * logger: A logging object
+
+            or (DEPRECATED):
+
             * os_token: pre-existing token to re-use
             * os_endpoint: Cloudkitty API endpoint
-            or:
+
+            or (DEPRECATED):
+
             * os_username: name of user
             * os_password: user's password
             * os_user_id: user's id
@@ -314,3 +346,87 @@ def get_auth_plugin(endpoint, **kwargs):
         project_domain_id=kwargs.get('project_domain_id')
     )
     return auth_plugin
+
+
+LEGACY_OPTS = ('auth_plugin', 'auth_url', 'token', 'insecure', 'cacert',
+               'tenant_id', 'project_id', 'username', 'password',
+               'project_name', 'tenant_name',
+               'user_domain_name', 'user_domain_id',
+               'project_domain_name', 'project_domain_id',
+               'key_file', 'cert_file', 'verify', 'timeout', 'cert')
+
+
+def construct_http_client(**kwargs):
+    kwargs = kwargs.copy()
+    if kwargs.get('session') is not None:
+        # Drop legacy options
+        for opt in LEGACY_OPTS:
+            kwargs.pop(opt, None)
+
+        return SessionClient(
+            session=kwargs.pop('session'),
+            service_type=kwargs.pop('service_type', 'rating') or 'rating',
+            interface=kwargs.pop('interface', kwargs.pop('endpoint_type',
+                                                         'publicURL')),
+            region_name=kwargs.pop('region_name', None),
+            user_agent=kwargs.pop('user_agent', 'python-cloudkittyclient'),
+            auth=kwargs.get('auth', None),
+            timings=kwargs.pop('timings', None),
+            **kwargs)
+    else:
+        return client.BaseClient(client.HTTPClient(
+            auth_plugin=kwargs.get('auth_plugin'),
+            region_name=kwargs.get('region_name'),
+            endpoint_type=kwargs.get('endpoint_type'),
+            original_ip=kwargs.get('original_ip'),
+            verify=kwargs.get('verify'),
+            cert=kwargs.get('cert'),
+            timeout=kwargs.get('timeout'),
+            timings=kwargs.get('timings'),
+            keyring_saver=kwargs.get('keyring_saver'),
+            debug=kwargs.get('debug'),
+            user_agent=kwargs.get('user_agent'),
+            http=kwargs.get('http')
+        ))
+
+
+@contextlib.contextmanager
+def record_time(times, enabled, *args):
+    """Record the time of a specific action.
+
+    :param times: A list of tuples holds time data.
+    :type times: list
+    :param enabled: Whether timing is enabled.
+    :type enabled: bool
+    :param args: Other data to be stored besides time data, these args
+                 will be joined to a string.
+    """
+    if not enabled:
+        yield
+    else:
+        start = time.time()
+        yield
+        end = time.time()
+        times.append((' '.join(args), start, end))
+
+
+class SessionClient(adapter.LegacyJsonAdapter):
+    def __init__(self, *args, **kwargs):
+        self.times = []
+        self.timings = kwargs.pop('timings', False)
+        super(SessionClient, self).__init__(*args, **kwargs)
+
+    def request(self, url, method, **kwargs):
+        kwargs.setdefault('headers', kwargs.get('headers', {}))
+        # NOTE(sileht): The standard call raises errors from
+        # keystoneauth, where we need to raise the cloudkittyclient errors.
+        raise_exc = kwargs.pop('raise_exc', True)
+        with record_time(self.times, self.timings, method, url):
+            resp, body = super(SessionClient, self).request(url,
+                                                            method,
+                                                            raise_exc=False,
+                                                            **kwargs)
+
+        if raise_exc and resp.status_code >= 400:
+            raise exc.from_response(resp, body)
+        return resp

cloudkittyclient/common/base.py

@@ -23,6 +23,7 @@ import copy
 from six.moves.urllib import parse
 
 from cloudkittyclient import exc
+from cloudkittyclient.i18n import _
 from cloudkittyclient.openstack.common.apiclient import base
 
 
@@ -138,7 +139,7 @@ class CrudManager(base.CrudManager):
                 'name': self.resource_class.__name__,
                 'args': kwargs
             }
-            raise exc.NotFound(404, msg)
+            raise exc.HTTPNotFound(msg)
         return rl
 
 

cloudkittyclient/common/utils.py

@@ -27,6 +27,7 @@ import prettytable
 import six
 
 from cloudkittyclient import exc
+from cloudkittyclient.i18n import _
 from cloudkittyclient.openstack.common import cliutils
 
 
@@ -45,7 +46,9 @@ def arg(*args, **kwargs):
                 kwargs['help'] += " Defaults to %s." % kwargs['default']
             required = kwargs.get('required', False)
             if required:
-                kwargs['help'] += " Required."
+                kwargs['help'] += " required."
+            elif 'default' not in kwargs:
+                kwargs['help'] += "."
 
         # Because of the sematics of decorator composition if we just append
         # to the options list positional options will appear to be backwards.
@@ -140,8 +143,10 @@ def find_resource(manager, name_or_id):
     try:
         return manager.find(name=name_or_id)
     except exc.HTTPNotFound:
-        msg = ("No %s with a name or ID of '%s' exists." %
-               (manager.resource_class.__name__.lower(), name_or_id))
+        msg = _("No %(name)s with a name or ID of '%(id)s' exists.") % {
+            "name": manager.resource_class.__name__.lower(),
+            "id": name_or_id
+        }
         raise exc.CommandError(msg)
 
 
@@ -152,9 +157,12 @@ def args_array_to_dict(kwargs, key_to_convert):
             kwargs[key_to_convert] = dict(v.split("=", 1)
                                           for v in values_to_convert)
         except ValueError:
-            raise exc.CommandError(
-                '%s must be a list of key=value not "%s"' % (
-                    key_to_convert, values_to_convert))
+            msg = _("%(key)s must be a list of key=value "
+                    "not '%(value)s'") % {
+                "key": key_to_convert,
+                "value": values_to_convert
+            }
+            raise exc.CommandError(msg)
     return kwargs
 
 
@@ -172,9 +180,12 @@ def args_array_to_list_of_dicts(kwargs, key_to_convert):
                     dct[kv[0]] = kv[1].strip(" \"'")  # strip spaces and quotes
                 kwargs[key_to_convert].append(dct)
         except Exception:
-            raise exc.CommandError(
-                '%s must be a list of key1=value1;key2=value2;... not "%s"' % (
-                    key_to_convert, values_to_convert))
+            msg = _("%(key)s must be a list of "
+                    "key1=value1;key2=value2;... not '%(value)s'") % {
+                "key": key_to_convert,
+                "value": values_to_convert
+            }
+            raise exc.CommandError(msg)
     return kwargs
 
 

cloudkittyclient/i18n.py

@@ -0,0 +1,28 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""oslo.i18n integration module.
+
+See http://docs.openstack.org/developer/oslo.i18n/usage.html
+
+"""
+
+import oslo_i18n as i18n
+
+_translators = i18n.TranslatorFactory(domain='cloudkittyclient')
+i18n.enable_lazy()
+
+_ = _translators.primary
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical

cloudkittyclient/openstack/common/_i18n.py

@@ -1,45 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""oslo.i18n integration module.
-
-See http://docs.openstack.org/developer/oslo.i18n/usage.html
-
-"""
-
-try:
-    import oslo_i18n
-
-    # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
-    # application name when this module is synced into the separate
-    # repository. It is OK to have more than one translation function
-    # using the same domain, since there will still only be one message
-    # catalog.
-    _translators = oslo_i18n.TranslatorFactory(domain='cloudkittyclient')
-
-    # The primary translation function using the well-known name "_"
-    _ = _translators.primary
-
-    # Translators for log levels.
-    #
-    # The abbreviated names are meant to reflect the usual use of a short
-    # name like '_'. The "L" is for "log" and the other letter comes from
-    # the level.
-    _LI = _translators.log_info
-    _LW = _translators.log_warning
-    _LE = _translators.log_error
-    _LC = _translators.log_critical
-except ImportError:
-    # NOTE(dims): Support for cases where a project wants to use
-    # code from oslo-incubator, but is not ready to be internationalized
-    # (like tempest)
-    _ = _LI = _LW = _LE = _LC = lambda x: x

cloudkittyclient/openstack/common/apiclient/base.py

@@ -44,7 +44,7 @@ from oslo_utils import strutils
 import six
 from six.moves.urllib import parse
 
-from cloudkittyclient.openstack.common._i18n import _
+from cloudkittyclient.i18n import _
 from cloudkittyclient.openstack.common.apiclient import exceptions
 
 

cloudkittyclient/openstack/common/apiclient/client.py

@@ -38,7 +38,7 @@ from oslo_utils import encodeutils
 from oslo_utils import importutils
 import requests
 
-from cloudkittyclient.openstack.common._i18n import _
+from cloudkittyclient.i18n import _
 from cloudkittyclient.openstack.common.apiclient import exceptions
 
 _logger = logging.getLogger(__name__)

cloudkittyclient/openstack/common/apiclient/exceptions.py

@@ -38,7 +38,7 @@ import sys
 
 import six
 
-from cloudkittyclient.openstack.common._i18n import _
+from cloudkittyclient.i18n import _
 
 
 class ClientException(Exception):

cloudkittyclient/openstack/common/apiclient/utils.py

@@ -28,7 +28,7 @@ from oslo_utils import encodeutils
 from oslo_utils import uuidutils
 import six
 
-from cloudkittyclient.openstack.common._i18n import _
+from cloudkittyclient.i18n import _
 from cloudkittyclient.openstack.common.apiclient import exceptions
 
 

cloudkittyclient/openstack/common/cliutils.py

@@ -30,7 +30,7 @@ import prettytable
 import six
 from six import moves
 
-from cloudkittyclient.openstack.common._i18n import _
+from cloudkittyclient.i18n import _
 
 
 class MissingArgs(Exception):

cloudkittyclient/shell.py

@@ -54,6 +54,9 @@ def _positive_non_zero_int(argument_value):
 
 class CloudkittyShell(object):
 
+    def __init__(self):
+        self.auth_plugin = ckclient.AuthPlugin()
+
     def get_base_parser(self):
         parser = argparse.ArgumentParser(
             prog='cloudkitty',
@@ -174,7 +177,6 @@ class CloudkittyShell(object):
 
     def parse_args(self, argv):
         # Parse args once to find version
-        self.auth_plugin = ckclient.AuthPlugin()
         parser = self.get_base_parser()
         (options, args) = parser.parse_known_args(argv)
         self.auth_plugin.parse_opts(options)
@@ -196,12 +198,11 @@ class CloudkittyShell(object):
 
     @staticmethod
     def no_project_and_domain_set(args):
-        if not (args.os_project_id or (args.os_project_name and
-                (args.os_user_domain_name or args.os_user_domain_id)) or
-                (args.os_tenant_id or args.os_tenant_name)):
-            return True
-        else:
-            return False
+        return not (((args.os_project_id or (args.os_project_name and
+                    (args.os_project_domain_name or
+                        args.os_project_domain_id)))
+                     and (args.os_user_domain_name or args.os_user_domain_id))
+                    or (args.os_tenant_id or args.os_tenant_name))
 
     def main(self, argv):
         parsed = self.parse_args(argv)
@@ -240,20 +241,24 @@ class CloudkittyShell(object):
                                        "env[OS_USER_DOMAIN_NAME] or "
                                        "a domain_id via either "
                                        "--os-user-domain-id or via "
-                                       "env[OS_USER_DOMAIN_ID]")
-
-            if not (self.auth_plugin.opts['tenant_id']
-                    or self.auth_plugin.opts['tenant_name']):
-                raise exc.CommandError("You must provide a tenant_id via "
-                                       "either --os-tenant-id or via "
-                                       "env[OS_TENANT_ID]")
+                                       "env[OS_USER_DOMAIN_ID]\n\n"
+                                       "As an alternative to project_id, "
+                                       "you can provide a project_name via "
+                                       "either --os-project-name or via "
+                                       "env[OS_PROJECT_NAME] and "
+                                       "a project_domain_name via either "
+                                       "--os-project-domain-name or via "
+                                       "env[OS_PROJECT_DOMAIN_NAME] or "
+                                       "a project_domain_id via either "
+                                       "--os-project-domain-id or via "
+                                       "env[OS_PROJECT_DOMAIN_ID]")
 
             if not self.auth_plugin.opts['auth_url']:
                 raise exc.CommandError("You must provide an auth url via "
                                        "either --os-auth-url or via "
                                        "env[OS_AUTH_URL]")
 
-        client_kwargs = vars(args)
+        client_kwargs = {}
         client_kwargs.update(self.auth_plugin.opts)
         client_kwargs['auth_plugin'] = self.auth_plugin
         client = ckclient.get_client(api_version, **client_kwargs)

cloudkittyclient/tests/test_client.py

@@ -45,6 +45,16 @@ class ClientTest(utils.BaseTestCase):
     def setUp(self):
         super(ClientTest, self).setUp()
 
+    def test_client_v1_with_session(self):
+        resp = mock.Mock(status_code=200, text=b'')
+        resp.json.return_value = {"modules": []}
+        session = mock.Mock()
+        session.request.return_value = resp
+        c = client.get_client(1, session=session)
+        c.modules.list()
+        self.assertTrue(session.request.called)
+        self.assertTrue(resp.json.called)
+
     def test_client_version(self):
         c1 = self.create_client(env=FAKE_ENV, api_version=1)
         self.assertIsInstance(c1, v1client.Client)
@@ -137,7 +147,8 @@ class ClientTest(utils.BaseTestCase):
         env = FAKE_ENV.copy()
         env['cacert'] = '/path/to/cacert'
         client = self.create_client(env)
-        self.assertEqual('/path/to/cacert', client.client.verify)
+        self.assertEqual('/path/to/cacert',
+                         client.http_client.http_client.verify)
 
     def test_v1_client_certfile_and_keyfile(self):
         env = FAKE_ENV.copy()
@@ -145,4 +156,4 @@ class ClientTest(utils.BaseTestCase):
         env['key_file'] = '/path/to/keycert'
         client = self.create_client(env)
         self.assertEqual(('/path/to/cert', '/path/to/keycert'),
-                         client.client.cert)
+                         client.http_client.http_client.cert)

cloudkittyclient/tests/v1/test_core.py

@@ -94,9 +94,9 @@ class CloudkittyModuleManagerTest(utils.BaseTestCase):
             'GET', '/v1/rating/modules'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(len(resources), 2)
-        self.assertEqual(resources[0].module_id, 'hashmap')
-        self.assertEqual(resources[1].module_id, 'noop')
+        self.assertEqual(2, len(resources))
+        self.assertEqual('hashmap', resources[0].module_id)
+        self.assertEqual('noop', resources[1].module_id)
 
     def test_get_module_status(self):
         resource = self.mgr.get(module_id='hashmap')
@@ -104,8 +104,8 @@ class CloudkittyModuleManagerTest(utils.BaseTestCase):
             'GET', '/v1/rating/modules/hashmap'
         ]
         self.http_client.assert_called(*expect)
-        self.assertEqual(resource.module_id, 'hashmap')
-        self.assertEqual(resource.enabled, True)
+        self.assertEqual('hashmap', resource.module_id)
+        self.assertTrue(resource.enabled)
 
 
 class CloudkittyModuleTest(utils.BaseTestCase):

cloudkittyclient/v1/client.py

@@ -16,7 +16,6 @@
 from stevedore import extension
 
 from cloudkittyclient import client as ckclient
-from cloudkittyclient.openstack.common.apiclient import client
 from cloudkittyclient.v1 import collector
 from cloudkittyclient.v1 import core
 from cloudkittyclient.v1 import report
@@ -28,33 +27,33 @@ SUBMODULES_NAMESPACE = 'cloudkitty.client.modules'
 class Client(object):
     """Client for the Cloudkitty v1 API.
 
-    :param string endpoint: A user-supplied endpoint URL for the cloudkitty
-                            service.
-    :param function token: Provides token for authentication.
-    :param integer timeout: Allows customization of the timeout for client
-                            http requests. (optional)
+    :param session: a keystoneauth/keystoneclient session object
+    :type session: keystoneclient.session.Session
+    :param str service_type: The default service_type for URL discovery
+    :param str service_name: The default service_name for URL discovery
+    :param str interface: The default interface for URL discovery
+                          (Default: public)
+    :param str region_name: The default region_name for URL discovery
+    :param str endpoint_override: Always use this endpoint URL for requests
+                                  for this cloudkittyclient
+    :param auth: An auth plugin to use instead of the session one
+    :type auth: keystoneclient.auth.base.BaseAuthPlugin
+    :param str user_agent: The User-Agent string to set
+                           (Default is python-cloudkittyclient)
+    :param int connect_retries: the maximum number of retries that should be
+                                attempted for connection errors
+    :param logger: A logging object
+    :type logger: logging.Logger
     """
 
     def __init__(self, *args, **kwargs):
         """Initialize a new client for the Cloudkitty v1 API."""
-        self.auth_plugin = (kwargs.get('auth_plugin')
-                            or ckclient.get_auth_plugin(*args, **kwargs))
-        self.client = client.HTTPClient(
-            auth_plugin=self.auth_plugin,
-            region_name=kwargs.get('region_name'),
-            endpoint_type=kwargs.get('endpoint_type'),
-            original_ip=kwargs.get('original_ip'),
-            verify=kwargs.get('verify'),
-            cert=kwargs.get('cert'),
-            timeout=kwargs.get('timeout'),
-            timings=kwargs.get('timings'),
-            keyring_saver=kwargs.get('keyring_saver'),
-            debug=kwargs.get('debug'),
-            user_agent=kwargs.get('user_agent'),
-            http=kwargs.get('http')
-        )
 
-        self.http_client = client.BaseClient(self.client)
+        if not kwargs.get('auth_plugin'):
+            kwargs['auth_plugin'] = ckclient.get_auth_plugin(*args, **kwargs)
+        self.auth_plugin = kwargs.get('auth_plugin')
+
+        self.http_client = ckclient.construct_http_client(**kwargs)
         self.modules = core.CloudkittyModuleManager(self.http_client)
         self.collector = collector.CollectorManager(self.http_client)
         self.reports = report.ReportManager(self.http_client)

cloudkittyclient/v1/collector/shell.py

@@ -17,64 +17,71 @@
 from cloudkittyclient.common import utils
 
 
-@utils.arg('--collector',
+@utils.arg('-c', '--collector',
            help='Collector name to filter on.',
            required=False,
            default=None)
 def do_collector_mapping_list(cc, args):
+    """List collector mapping."""
     data = cc.collector.mappings.list(collector=args.collector)
     fields = ['service', 'collector']
     fields_labels = ['Service', 'Collector']
     utils.print_list(data, fields, fields_labels, sortby=0)
 
 
-@utils.arg('--service',
+@utils.arg('-s', '--service',
            help='Which service to get the mapping for.',
            required=True)
 def do_collector_mapping_get(cc, args):
+    """Show collector mapping detail."""
     data = cc.collector.mappings.get(mapping_id=args.service)
     utils.print_dict(data.to_dict())
 
 
-@utils.arg('--collector',
+@utils.arg('-c', '--collector',
            help='Map a service to this collector.',
            required=True)
-@utils.arg('--service',
+@utils.arg('-s', '--service',
            help='Map a collector to this service.',
            required=True)
 def do_collector_mapping_create(cc, args):
+    """Create collector mapping."""
     out = cc.collector.mappings.create(service=args.service,
                                        collector=args.collector)
     utils.print_dict(out.to_dict())
 
 
-@utils.arg('--service',
+@utils.arg('-s', '--service',
            help='Filter on this service.',
            required=True)
 def do_collector_mapping_delete(cc, args):
+    """Delete collector mapping."""
     # TODO(sheeprine): Use a less hacky way to do this
     cc.collector.mappings.delete(mapping_id=args.service)
 
 
-@utils.arg('--name',
+@utils.arg('-n', '--name',
            help='Name of the collector.',
            required=True)
 def do_collector_state_get(cc, args):
+    """Show collector state."""
     data = cc.collector.states.get(state_id=args.name)
     utils.print_dict(data.to_dict())
 
 
-@utils.arg('--name',
+@utils.arg('-n', '--name',
            help='Name of the collector.',
            required=True)
 def do_collector_state_enable(cc, args):
+    """Enable collector state."""
     new_state = cc.collector.states.update(name=args.name, enabled=True)
     utils.print_dict(new_state.to_dict())
 
 
-@utils.arg('--name',
+@utils.arg('-n', '--name',
            help='Name of the collector.',
            required=True)
 def do_collector_state_disable(cc, args):
+    """Disable collector state."""
     new_state = cc.collector.states.update(name=args.name, enabled=False)
     utils.print_dict(new_state.to_dict())

cloudkittyclient/v1/rating/hashmap/__init__.py

@@ -15,23 +15,76 @@
 from cloudkittyclient.common import base
 
 
-class Service(base.Resource):
-    key = 'service'
+class BaseAttributeMixin(object):
+    def _validate_attribute(self, attribute):
+        attr = getattr(self, attribute)
+        if attr:
+            kwargs = {attribute: attr}
+            return kwargs
 
-    def __repr__(self):
-        return "<hashmap.Service %s>" % self._info
+    def _get_resource(self, mgr, attribute):
+        kwargs = self._validate_attribute(attribute)
+        if kwargs:
+            return mgr(client=self.manager.client).get(**kwargs)
+
+    def _get_resources(self, mgr, attribute):
+        kwargs = self._validate_attribute(attribute)
+        if kwargs:
+            try:
+                return mgr(client=self.manager.client).findall(**kwargs)
+            except Exception:
+                pass
+        return []
+
+
+class ServiceMixin(BaseAttributeMixin):
+    @property
+    def service(self):
+        return self._get_resource(ServiceManager, 'service_id')
+
+
+class FieldMixin(BaseAttributeMixin):
+    @property
+    def field(self):
+        return self._get_resource(FieldManager, 'field_id')
+
+
+class GroupMixin(BaseAttributeMixin):
+    @property
+    def group(self):
+        return self._get_resource(GroupManager, 'group_id')
+
+
+class FieldsMixin(BaseAttributeMixin):
+    attribute = ''
 
     @property
     def fields(self):
-        return FieldManager(client=self.manager.client).findall(
-            service_id=self.service_id
-        )
+        return self._get_resources(FieldManager, self.attribute)
+
+
+class MappingsMixin(BaseAttributeMixin):
+    attribute = ''
 
     @property
     def mappings(self):
-        return MappingManager(client=self.manager.client).findall(
-            service_id=self.service_id
-        )
+        return self._get_resources(MappingManager, self.attribute)
+
+
+class ThresholdsMixin(BaseAttributeMixin):
+    attribute = ''
+
+    @property
+    def thresholds(self):
+        return self._get_resources(ThresholdManager, self.attribute)
+
+
+class Service(base.Resource, FieldsMixin, MappingsMixin, ThresholdsMixin):
+    key = 'service'
+    attribute = 'service_id'
+
+    def __repr__(self):
+        return "<hashmap.Service %s>" % self._info
 
 
 class ServiceManager(base.CrudManager):
@@ -41,18 +94,13 @@ class ServiceManager(base.CrudManager):
     collection_key = 'services'
 
 
-class Field(base.Resource):
+class Field(base.Resource, ServiceMixin, MappingsMixin, ThresholdsMixin):
     key = 'field'
+    attribute = 'field_id'
 
     def __repr__(self):
         return "<hashmap.Field %s>" % self._info
 
-    @property
-    def service(self):
-        return ServiceManager(client=self.manager.client).get(
-            service_id=self.service_id
-        )
-
 
 class FieldManager(base.CrudManager):
     resource_class = Field
@@ -61,26 +109,12 @@ class FieldManager(base.CrudManager):
     collection_key = 'fields'
 
 
-class Mapping(base.Resource):
+class Mapping(base.Resource, ServiceMixin, FieldMixin, GroupMixin):
     key = 'mapping'
 
     def __repr__(self):
         return "<hashmap.Mapping %s>" % self._info
 
-    @property
-    def service(self):
-        return ServiceManager(client=self.manager.client).get(
-            service_id=self.service_id
-        )
-
-    @property
-    def field(self):
-        if self.field_id is None:
-            return None
-        return FieldManager(client=self.manager.client).get(
-            service_id=self.service_id
-        )
-
 
 class MappingManager(base.CrudManager):
     resource_class = Mapping
@@ -89,8 +123,9 @@ class MappingManager(base.CrudManager):
     collection_key = 'mappings'
 
 
-class Group(base.Resource):
+class Group(base.Resource, MappingsMixin, ThresholdsMixin):
     key = 'group'
+    attribute = 'group_id'
 
     def __repr__(self):
         return "<hashmap.Group %s>" % self._info
@@ -112,7 +147,7 @@ class GroupManager(base.CrudManager):
         return self._delete(url)
 
 
-class Threshold(base.Resource):
+class Threshold(base.Resource, ServiceMixin, FieldMixin, GroupMixin):
     key = 'threshold'
 
     def __repr__(self):
@@ -124,9 +159,3 @@ class ThresholdManager(base.CrudManager):
     base_url = '/v1/rating/module_config/hashmap'
     key = 'threshold'
     collection_key = 'thresholds'
-
-    def group(self, threshold_id):
-        url = ('%(base_url)s/thresholds/%(threshold_id)s/group' %
-               {'base_url': self.base_url, 'threshold_id': threshold_id})
-        out = self._get(url)
-        return out

cloudkittyclient/v1/rating/hashmap/shell.py

@@ -89,7 +89,7 @@ def do_hashmap_field_create(cc, args={}):
            help='Service id',
            required=True)
 def do_hashmap_field_list(cc, args={}):
-    """Create a field."""
+    """List fields."""
     try:
         created_field = cc.hashmap.fields.list(service_id=args.service_id)
     except exc.HTTPNotFound:
@@ -112,24 +112,37 @@ def do_hashmap_field_delete(cc, args={}):
         raise exc.CommandError('Field not found: %s' % args.counter_name)
 
 
-@utils.arg('-c', '--cost',
-           help='Mapping cost',
-           required=True)
-@utils.arg('-v', '--value',
-           help='Mapping value',
-           required=False)
-@utils.arg('-t', '--type',
-           help='Mapping type (flat, rate)',
-           required=False)
+def common_hashmap_mapping_arguments(create=False):
+    def _wrapper(func):
+        @utils.arg('-c', '--cost',
+                   help='Mapping cost',
+                   required=create)
+        @utils.arg('-v', '--value',
+                   help='Mapping value',
+                   required=False)
+        @utils.arg('-t', '--type',
+                   help='Mapping type (flat, rate)',
+                   required=False)
+        @utils.arg('-g', '--group-id',
+                   help='Group id',
+                   required=False)
+        @utils.arg('-p', '--project-id',
+                   help='Project/tenant id',
+                   required=False)
+        @functools.wraps(func)
+        def _wrapped(*args, **kwargs):
+            return func(*args, **kwargs)
+        return _wrapped
+    return _wrapper
+
+
 @utils.arg('-s', '--service-id',
            help='Service id',
            required=False)
 @utils.arg('-f', '--field-id',
            help='Field id',
            required=False)
-@utils.arg('-g', '--group-id',
-           help='Group id',
-           required=False)
+@common_hashmap_mapping_arguments(create=True)
 def do_hashmap_mapping_create(cc, args={}):
     """Create a mapping."""
     arg_to_field_mapping = {
@@ -139,6 +152,7 @@ def do_hashmap_mapping_create(cc, args={}):
         'service_id': 'service_id',
         'field_id': 'field_id',
         'group_id': 'group_id',
+        'project_id': 'tenant_id',
     }
     fields = {}
     for k, v in vars(args).items():
@@ -152,18 +166,7 @@ def do_hashmap_mapping_create(cc, args={}):
 @utils.arg('-m', '--mapping-id',
            help='Mapping id',
            required=True)
-@utils.arg('-c', '--cost',
-           help='Mapping cost',
-           required=False)
-@utils.arg('-v', '--value',
-           help='Mapping value',
-           required=False)
-@utils.arg('-t', '--type',
-           help='Mapping type (flat, rate)',
-           required=False)
-@utils.arg('-g', '--group-id',
-           help='Group id',
-           required=False)
+@common_hashmap_mapping_arguments()
 def do_hashmap_mapping_update(cc, args={}):
     """Update a mapping."""
     arg_to_field_mapping = {
@@ -172,6 +175,7 @@ def do_hashmap_mapping_update(cc, args={}):
         'value': 'value',
         'type': 'type',
         'group_id': 'group_id',
+        'project_id': 'tenant_id',
     }
     try:
         mapping = cc.hashmap.mappings.get(mapping_id=args.mapping_id)
@@ -193,10 +197,15 @@ def do_hashmap_mapping_update(cc, args={}):
 @utils.arg('-g', '--group-id',
            help='Group id',
            required=False)
+@utils.arg('-p', '--project-id',
+           help='Project/tenant id',
+           required=False)
 def do_hashmap_mapping_list(cc, args={}):
     """List mappings."""
-    if args.service_id is None and args.field_id is None:
-        raise exc.CommandError("Provide either service-id or field-id")
+    if (args.group_id is None and
+       args.service_id is None and args.field_id is None):
+        raise exc.CommandError("Provide either group-id, service-id or "
+                               "field-id")
     try:
         mappings = cc.hashmap.mappings.list(service_id=args.service_id,
                                             field_id=args.field_id,
@@ -206,10 +215,10 @@ def do_hashmap_mapping_list(cc, args={}):
     else:
         field_labels = ['Mapping id', 'Value', 'Cost',
                         'Type', 'Field id',
-                        'Service id', 'Group id']
+                        'Service id', 'Group id', 'Tenant id']
         fields = ['mapping_id', 'value', 'cost',
                   'type', 'field_id',
-                  'service_id', 'group_id']
+                  'service_id', 'group_id', 'tenant_id']
         utils.print_list(mappings, fields, field_labels,
                          sortby=0)
 
@@ -272,33 +281,47 @@ def do_hashmap_group_delete(cc, args={}):
         raise exc.CommandError('Group not found: %s' % args.group_id)
 
 
-@utils.arg('-l', '--level',
-           help='Threshold level',
-           required=True)
-@utils.arg('-c', '--cost',
-           help='Threshold cost',
-           required=True)
-@utils.arg('-m', '--map-type',
-           help='Threshold type (flat, rate)',
-           required=False)
+def common_hashmap_threshold_arguments(create=False):
+    def _wrapper(func):
+        @utils.arg('-l', '--level',
+                   help='Threshold level',
+                   required=create)
+        @utils.arg('-c', '--cost',
+                   help='Threshold cost',
+                   required=create)
+        @utils.arg('-t', '--type',
+                   help='Threshold type (flat, rate)',
+                   required=False)
+        @utils.arg('-g', '--group-id',
+                   help='Group id',
+                   required=False)
+        @utils.arg('-p', '--project-id',
+                   help='Project/tenant id',
+                   required=False)
+        @functools.wraps(func)
+        def _wrapped(*args, **kwargs):
+            return func(*args, **kwargs)
+        return _wrapped
+    return _wrapper
+
+
 @utils.arg('-s', '--service-id',
            help='Service id',
            required=False)
 @utils.arg('-f', '--field-id',
            help='Field id',
            required=False)
-@utils.arg('-g', '--group-id',
-           help='Group id',
-           required=False)
+@common_hashmap_threshold_arguments(create=True)
 def do_hashmap_threshold_create(cc, args={}):
     """Create a mapping."""
     arg_to_field_mapping = {
         'level': 'level',
         'cost': 'cost',
-        'map_type': 'map_type',
+        'type': 'type',
         'service_id': 'service_id',
         'field_id': 'field_id',
         'group_id': 'group_id',
+        'project_id': 'tenant_id',
     }
     fields = {}
     for k, v in vars(args).items():
@@ -309,29 +332,19 @@ def do_hashmap_threshold_create(cc, args={}):
     utils.print_dict(out.to_dict())
 
 
-@utils.arg('-t', '--threshold-id',
+@utils.arg('-i', '--threshold-id',
            help='Threshold id',
            required=True)
-@utils.arg('-l', '--level',
-           help='Threshold level',
-           required=False)
-@utils.arg('-c', '--cost',
-           help='Threshold cost',
-           required=False)
-@utils.arg('-m', '--map-type',
-           help='Threshold type (flat, rate)',
-           required=False)
-@utils.arg('-g', '--group-id',
-           help='Group id',
-           required=False)
+@common_hashmap_threshold_arguments()
 def do_hashmap_threshold_update(cc, args={}):
     """Update a threshold."""
     arg_to_field_mapping = {
         'threshold_id': 'threshold_id',
         'cost': 'cost',
         'level': 'level',
-        'map_type': 'map_type',
+        'type': 'type',
         'group_id': 'group_id',
+        'project_id': 'tenant_id',
     }
     try:
         threshold = cc.hashmap.thresholds.get(threshold_id=args.threshold_id)
@@ -357,6 +370,9 @@ def do_hashmap_threshold_update(cc, args={}):
            type=_bool_strict, metavar='{True,False}',
            help='If True, list only orhpaned thresholds',
            required=False)
+@utils.arg('-p', '--project-id',
+           help='Project/tenant id',
+           required=False)
 def do_hashmap_threshold_list(cc, args={}):
     """List thresholds."""
     if (args.group_id is None and
@@ -373,14 +389,14 @@ def do_hashmap_threshold_list(cc, args={}):
     else:
         field_labels = ['Threshold id', 'Level', 'Cost',
                         'Type', 'Field id',
-                        'Service id', 'Group id']
+                        'Service id', 'Group id', 'Tenant id']
         fields = ['threshold_id', 'level', 'cost',
-                  'map_type', 'field_id',
-                  'service_id', 'group_id']
+                  'type', 'field_id',
+                  'service_id', 'group_id', 'tenant_id']
         utils.print_list(thresholds, fields, field_labels, sortby=0)
 
 
-@utils.arg('-t', '--threshold-id',
+@utils.arg('-i', '--threshold-id',
            help='Threshold uuid',
            required=True)
 def do_hashmap_threshold_delete(cc, args={}):
@@ -391,7 +407,7 @@ def do_hashmap_threshold_delete(cc, args={}):
         raise exc.CommandError('Threshold not found: %s' % args.threshold_id)
 
 
-@utils.arg('-t', '--threshold-id',
+@utils.arg('-i', '--threshold-id',
            help='Threshold uuid',
            required=True)
 def do_hashmap_threshold_get(cc, args={}):
@@ -403,7 +419,7 @@ def do_hashmap_threshold_get(cc, args={}):
     utils.print_dict(threshold.to_dict())
 
 
-@utils.arg('-t', '--threshold-id',
+@utils.arg('-i', '--threshold-id',
            help='Threshold uuid',
            required=True)
 def do_hashmap_threshold_group(cc, args={}):

cloudkittyclient/v1/rating/pyscripts/__init__.py

@@ -0,0 +1,30 @@
+# Copyright 2015 Objectif Libre
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from cloudkittyclient.common import base
+
+
+class Script(base.Resource):
+    key = 'script'
+
+    def __repr__(self):
+        return "<pyscripts.Script %s>" % self._info
+
+
+class ScriptManager(base.CrudManager):
+    resource_class = Script
+    base_url = '/v1/rating/module_config/pyscripts'
+    key = 'script'
+    collection_key = 'scripts'

cloudkittyclient/v1/rating/pyscripts/client.py

@@ -0,0 +1,28 @@
+# Copyright 2015 Objectif Libre
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from cloudkittyclient.v1.rating import pyscripts
+
+
+class Client(object):
+    """Client for the PyScripts v1 API.
+
+    :param http_client: A http client.
+    """
+
+    def __init__(self, http_client):
+        """Initialize a new client for the PyScripts v1 API."""
+        self.http_client = http_client
+        self.scripts = pyscripts.ScriptManager(self.http_client)

cloudkittyclient/v1/rating/pyscripts/extension.py

@@ -0,0 +1,31 @@
+# Copyright 2015 Objectif Libre
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from cloudkittyclient.v1.rating.pyscripts import client
+from cloudkittyclient.v1.rating.pyscripts import shell
+
+
+class Extension(object):
+    """PyScripts extension.
+
+    """
+
+    @staticmethod
+    def get_client(http_client):
+        return client.Client(http_client)
+
+    @staticmethod
+    def get_shell():
+        return shell

cloudkittyclient/v1/rating/pyscripts/shell.py

@@ -0,0 +1,116 @@
+# Copyright 2015 Objectif Libre
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+import functools
+
+from oslo_utils import strutils
+import six
+
+from cloudkittyclient.common import utils
+from cloudkittyclient import exc
+
+_bool_strict = functools.partial(strutils.bool_from_string, strict=True)
+
+
+@utils.arg('-n', '--name',
+           help='Script name',
+           required=True)
+@utils.arg('-f', '--file',
+           help='Script file',
+           required=False)
+def do_pyscripts_script_create(cc, args={}):
+    """Create a script."""
+    script_args = {'name': args.name}
+    if args.file:
+        with open(args.file) as fp:
+            script_args['data'] = fp.read()
+    out = cc.pyscripts.scripts.create(**script_args)
+    utils.print_dict(out.to_dict())
+
+
+@utils.arg('-d', '--show-data',
+           help='Show data in the listing',
+           required=False,
+           default=False)
+def do_pyscripts_script_list(cc, args={}):
+    """List scripts."""
+    request_args = {}
+    if not args.show_data:
+        request_args['no_data'] = True
+    scripts = cc.pyscripts.scripts.list(**request_args)
+    field_labels = ['Name', 'Script id', 'Data', 'Checksum']
+    fields = ['name', 'script_id', 'data', 'checksum']
+    utils.print_list(scripts,
+                     fields,
+                     field_labels,
+                     sortby=0)
+
+
+@utils.arg('-s', '--script-id',
+           help='Script uuid',
+           required=True)
+def do_pyscripts_script_get(cc, args={}):
+    """Get script."""
+    try:
+        script = cc.pyscripts.scripts.get(script_id=args.script_id)
+    except exc.HTTPNotFound:
+        raise exc.CommandError('Script not found: %s' % args.script_id)
+    utils.print_dict(script.to_dict())
+
+
+@utils.arg('-s', '--script-id',
+           help='Script uuid',
+           required=True)
+def do_pyscripts_script_get_data(cc, args={}):
+    """Get script data."""
+    try:
+        script = cc.pyscripts.scripts.get(script_id=args.script_id)
+    except exc.HTTPNotFound:
+        raise exc.CommandError('Script not found: %s' % args.script_id)
+    six.print_(script.data)
+
+
+@utils.arg('-s', '--script-id',
+           help='Script uuid',
+           required=True)
+def do_pyscripts_script_delete(cc, args={}):
+    """Delete a script."""
+    try:
+        cc.pyscripts.scripts.delete(script_id=args.script_id)
+    except exc.HTTPNotFound:
+        raise exc.CommandError('Script not found: %s' % args.counter_name)
+
+
+@utils.arg('-s', '--script-id',
+           help='Script uuid',
+           required=True)
+@utils.arg('-f', '--file',
+           help='Script file',
+           required=True)
+def do_pyscripts_script_update(cc, args={}):
+    """Update a mapping."""
+    excluded_fields = [
+        'checksum',
+    ]
+    with open(args.file) as fp:
+        content = fp.read()
+    try:
+        script = cc.pyscripts.scripts.get(script_id=args.script_id)
+    except exc.HTTPNotFound:
+        raise exc.CommandError('Script not found: %s' % args.script_id)
+    script_dict = script.to_dict()
+    for field in excluded_fields:
+        del script_dict[field]
+    script_dict['data'] = content
+    cc.pyscripts.scripts.update(**script_dict)

cloudkittyclient/v1/report/__init__.py

@@ -30,11 +30,17 @@ class ReportManager(base.Manager):
     def list_tenants(self):
         return self.client.get(self.base_url + "/tenants").json()
 
-    def get_total(self, tenant_id, begin=None, end=None):
-        url = self.base_url + "/total?tenant_id=%s" % tenant_id
-        filter = [url]
+    def get_total(self, tenant_id=None, begin=None, end=None, service=None):
+        url = self.base_url + "/total"
+        filters = list()
+        if tenant_id:
+            filters.append("tenant_id=%s" % tenant_id)
         if begin:
-            filter.append("begin=%s" % begin.isoformat())
+            filters.append("begin=%s" % begin.isoformat())
         if end:
-            filter.append("end=%s" % end.isoformat())
-        return self.client.get("&".join(filter)).json()
+            filters.append("end=%s" % end.isoformat())
+        if service:
+            filters.append("service=%s" % service)
+        if filters:
+            url += "?%s" % ('&'.join(filters))
+        return self.client.get(url).json()

cloudkittyclient/v1/report/shell.py

@@ -13,11 +13,13 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+from __future__ import print_function
 
 from cloudkittyclient.common import utils
 
 
 def do_report_tenant_list(cc, args):
+    """List tenant report."""
     tenants = cc.reports.list_tenants()
     out_table = utils.prettytable.PrettyTable()
     out_table.add_column("Tenant UUID", tenants)
@@ -26,17 +28,23 @@ def do_report_tenant_list(cc, args):
 
 @utils.arg('-t', '--tenant-id',
            help='Tenant id',
-           required=False, dest='total_tenant_id')
+           required=False,
+           dest='total_tenant_id')
 @utils.arg('-b', '--begin',
            help='Begin timestamp',
            required=False)
 @utils.arg('-e', '--end',
            help='End timestamp',
            required=False)
+@utils.arg('-s', '--service',
+           help='Service Type',
+           required=False)
 def do_total_get(cc, args):
+    """Get total reports."""
     begin = utils.ts2dt(args.begin) if args.begin else None
     end = utils.ts2dt(args.end) if args.end else None
-    total = cc.reports.get_total(args.total_tenant_id,
+    total = cc.reports.get_total(tenant_id=args.total_tenant_id,
                                  begin=begin,
-                                 end=end)
+                                 end=end,
+                                 service=args.service)
     utils.print_dict({'Total': total or 0.0})

cloudkittyclient/v1/storage/shell.py

@@ -32,6 +32,7 @@ from cloudkittyclient.common import utils
            required=False,
            default=None)
 def do_storage_dataframe_list(cc, args):
+    """List dataframes."""
     data = cc.storage.dataframes.list(begin=args.begin, end=args.end,
                                       tenant_id=args.tenant,
                                       resource_type=args.resource_type)

contrib/python-cloudkittyclient.spec.in

@@ -1,42 +0,0 @@
-Name: python-cloudkittyclient
-Version: @VERSION@
-Release: 1%{?dist}
-Summary: Client library for CloudKitty
-License: ASL 2.0
-Source: %{name}-%{version}.tar.gz
-
-BuildArch: noarch
-
-BuildRequires: python-setuptools
-BuildRequires: python-pbr
-BuildRequires: python-keystoneclient
-BuildRequires: python-stevedore
-BuildRequires: python-babel
-
-Requires: python-keystoneclient
-Requires: python-stevedore
-Requires: python-babel
-
-%description
-Client library for CloudKitty
-
-%prep
-%setup -q
-
-%build
-%{__python} setup.py build
-
-%install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-
-#export PYTHONPATH="$( pwd ):$PYTHONPATH"
-#sphinx-build -b html doc/source html
-
-%files
-%{_bindir}/*
-%{python_sitelib}/*
-#%doc html
-
-%changelog
-* Sun Apr 19 2015 Gauvain Pocentek <gauvain.pocentek@objectif-libre.com> @VERSION@-1
-- Initial release

requirements.txt

@@ -2,10 +2,11 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr!=0.7,<1.0,>=0.6
-Babel>=1.3
-python-keystoneclient<1.4.0,>=1.2.0
-stevedore<1.4.0,>=1.3.0 # Apache-2.0
-oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
-oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
-oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+pbr>=1.6 # Apache-2.0
+Babel>=2.3.4 # BSD
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
+stevedore>=1.10.0 # Apache-2.0
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
+oslo.utils>=3.11.0 # Apache-2.0
+PrettyTable<0.8,>=0.7 # BSD

setup.cfg

@@ -1,6 +1,5 @@
 [metadata]
 name = python-cloudkittyclient
-version = 0.4.1
 summary = API client of cloudkitty, Rating as a Service project.
 description-file =
     README.rst
@@ -17,7 +16,6 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
 
 [files]
@@ -30,6 +28,7 @@ console_scripts =
 
 cloudkitty.client.modules =
     hashmap = cloudkittyclient.v1.rating.hashmap.extension:Extension
+    pyscripts = cloudkittyclient.v1.rating.pyscripts.extension:Extension
 
 [build_sphinx]
 source-dir = doc/source

setup.py

@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

test-requirements.txt

@@ -4,12 +4,11 @@
 
 hacking<0.10,>=0.9.2
 
-coverage>=3.6
-discover
-python-subunit>=0.0.18
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
-oslotest<1.6.0,>=1.5.1 # Apache-2.0
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools!=1.2.0,>=0.9.36
+coverage>=3.6 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py33,py34,py27,pypy,pep8
+envlist = py34,py27,pypy,pep8
 skipsdist = True
 
 [testenv]
@@ -32,3 +32,6 @@ show-source = True
 ignore = E123,E125,H803
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+
+[hacking]
+import_exceptions = cloudkittyclient.i18n