diff options
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_shell.py | 1 | ||||
| -rw-r--r-- | ceilometerclient/v1/meters.py | 3 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 2 | ||||
| -rw-r--r-- | ceilometerclient/v2/statistics.py | 5 | ||||
| -rw-r--r-- | requirements.txt | 12 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 12 |
7 files changed, 20 insertions, 16 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py index c4a61a8..6cc5985 100644 --- a/ceilometerclient/tests/unit/v2/test_shell.py +++ b/ceilometerclient/tests/unit/v2/test_shell.py @@ -80,6 +80,7 @@ class ShellAlarmHistoryCommandTest(utils.BaseTestCase): '"ok_actions": [], ' '"project_id": "57d04f24d0824b78b1ea9bcecedbda8f", ' '"type": "combination", ' + '"severity": "low", ' '"description": "Combined state of alarms ' '062cc907-3a9f-4867-ab3b-fa83212b39f7"}') ALARM_HISTORY = [{'on_behalf_of': '57d04f24d0824b78b1ea9bcecedbda8f', diff --git a/ceilometerclient/v1/meters.py b/ceilometerclient/v1/meters.py index c8a784b..223bfb3 100644 --- a/ceilometerclient/v1/meters.py +++ b/ceilometerclient/v1/meters.py @@ -18,8 +18,9 @@ import six from ceilometerclient.common import base -def _get_opt_path(simple_params=[], **kwargs): +def _get_opt_path(simple_params=None, **kwargs): l = [] + simple_params = simple_params or [] # get simple paramters for key in simple_params: val = kwargs.get(key) diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 6cbe256..18719b9 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -353,7 +353,7 @@ def alarm_change_detail_formatter(change): if change.type == 'state transition': fields.append('state: %s' % detail['state']) elif change.type == 'creation' or change.type == 'deletion': - for k in ['name', 'description', 'type', 'rule']: + for k in ['name', 'description', 'type', 'rule', 'severity']: if k == 'rule': fields.append('rule: %s' % _display_rule(detail['type'], detail[k])) diff --git a/ceilometerclient/v2/statistics.py b/ceilometerclient/v2/statistics.py index a5cce23..4775238 100644 --- a/ceilometerclient/v2/statistics.py +++ b/ceilometerclient/v2/statistics.py @@ -44,7 +44,10 @@ class StatisticsManager(base.Manager): ) return url_aggregates - def list(self, meter_name, q=None, period=None, groupby=[], aggregates=[]): + def list(self, meter_name, q=None, period=None, groupby=None, + aggregates=None): + groupby = groupby or [] + aggregates = aggregates or [] p = ['period=%s' % period] if period else [] if isinstance(groupby, six.string_types): groupby = [groupby] diff --git a/requirements.txt b/requirements.txt index 3c8129f..fd82763 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.11,<2.0 +pbr<2.0,>=0.11 argparse iso8601>=0.1.9 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 -oslo.utils>=1.4.0 # Apache-2.0 -PrettyTable>=0.7,<0.8 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.6.0 # Apache-2.0 +PrettyTable<0.8,>=0.7 python-keystoneclient>=1.6.0 requests>=2.5.2 six>=1.9.0 -stevedore>=1.3.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test-requirements.txt b/test-requirements.txt index 231c9c6..d181ffd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,14 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 coverage>=3.6 discover -fixtures>=0.3.14 +fixtures>=1.3.1 mock>=1.0 -oslosphinx>=2.5.0 # Apache-2.0 +oslosphinx>=2.5.0 # Apache-2.0 python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -tempest-lib>=0.5.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +tempest-lib>=0.6.1 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 |