Hello community,
here is the log from the commit of package python-ceilometerclient for
openSUSE:Factory checked in at 2013-09-16 16:24:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-ceilometerclient (Old)
and /work/SRC/openSUSE:Factory/.python-ceilometerclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-ceilometerclient"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-ceilometerclient/python-ceilometerclient.changes
2013-09-16 12:38:44.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-ceilometerclient.new/python-ceilometerclient.changes
2013-09-16 16:24:38.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Sep 11 23:41:30 UTC 2013 - [email protected]
+
+- Update to version 1.0.3.4:
+ + Fix a typo in "sample-create" help message
+ + alarm: rename counter_name to meter_name
+
+-------------------------------------------------------------------
+Fri Sep 6 00:11:38 UTC 2013 - [email protected]
+
+- Update to version 1.0.3.1:
+ + Added support for running the tests under PyPy with tox
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-ceilometerclient.spec ++++++
--- /var/tmp/diff_new_pack.Te3ImY/_old 2013-09-16 16:24:38.000000000 +0200
+++ /var/tmp/diff_new_pack.Te3ImY/_new 2013-09-16 16:24:38.000000000 +0200
@@ -20,7 +20,7 @@
%define component ceilometerclient
Name: python-%{component}
-Version: 1.0.2.10
+Version: 1.0.3.4
Release: 0
Url: https://github.com/openstack/python-ceilometerclient
Summary: OpenStack Metering (Ceilometer) API Client
@@ -71,7 +71,7 @@
This package contains testsuite files for %{name}.
%prep
-%setup -q -n python-ceilometerclient-1.0.2.10.g9e33072
+%setup -q -n python-ceilometerclient-1.0.3.4.gb58d4ef
%openstack_cleanup_prep
echo %{version} > ceilometerclient/versioninfo
++++++ python-ceilometerclient-master.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ceilometerclient-1.0.2.10.g9e33072/AUTHORS
new/python-ceilometerclient-1.0.3.4.gb58d4ef/AUTHORS
--- old/python-ceilometerclient-1.0.2.10.g9e33072/AUTHORS 2013-08-09
14:47:21.000000000 +0200
+++ new/python-ceilometerclient-1.0.3.4.gb58d4ef/AUTHORS 2013-09-12
01:12:57.000000000 +0200
@@ -1,6 +1,8 @@
+Alex Gaynor <[email protected]>
Angus Salkeld <[email protected]>
Brian Waldon <[email protected]>
Chuck Short <[email protected]>
+Cyril Roelandt <[email protected]>
Dan Florea <[email protected]>
Dirk Mueller <[email protected]>
Eoghan Glynn <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ceilometerclient-1.0.2.10.g9e33072/ChangeLog
new/python-ceilometerclient-1.0.3.4.gb58d4ef/ChangeLog
--- old/python-ceilometerclient-1.0.2.10.g9e33072/ChangeLog 2013-08-09
14:47:21.000000000 +0200
+++ new/python-ceilometerclient-1.0.3.4.gb58d4ef/ChangeLog 2013-09-12
01:12:57.000000000 +0200
@@ -1,3 +1,41 @@
+commit b58d4ef76ce1ae85dfe89d35e3144641b92c8e67
+Merge: c3f2459 6fdd645
+Author: Jenkins <[email protected]>
+Date: Wed Sep 11 22:54:18 2013 +0000
+
+ Merge "alarm: rename counter_name to meter_name"
+
+commit c3f2459043a8a9ff9a9ed6897228a291a86f43c6
+Author: Cyril Roelandt <[email protected]>
+Date: Mon Sep 9 15:31:17 2013 +0000
+
+ Fix a typo in "sample-create" help message
+
+ The word "alarm" is used twice instead of "sample".
+
+ Change-Id: I9a3ce514f3a3766add14ed1b352e31bf003f1cee
+
+commit 3569e6586167f18682acc5843e4d5143355ac2ba
+Author: Alex Gaynor <[email protected]>
+Date: Thu Sep 5 09:57:46 2013 -0700
+
+ Added support for running the tests under PyPy with tox
+
+ This is a precursor to having them run under check and gate.
+
+ Change-Id: I42ed34362bb840fe3a6d1d22e28beba8963fdb85
+
+commit 6fdd6454b3044288d334489430b515035c65fa53
+Author: Julien Danjou <[email protected]>
+Date: Wed Sep 4 17:45:21 2013 +0200
+
+ alarm: rename counter_name to meter_name
+
+ This is a follow-up wrt the recent fix that handled in Ceilometer for
+ the alarming API.
+
+ Change-Id: Ide73a2e703bf31652b819c6d5170891c73b77ec9
+
commit 9e330726ce6409088f7cbf50f4c76622c2f1732f
Merge: 9e8a989 e8bf783
Author: Jenkins <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ceilometerclient-1.0.2.10.g9e33072/PKG-INFO
new/python-ceilometerclient-1.0.3.4.gb58d4ef/PKG-INFO
--- old/python-ceilometerclient-1.0.2.10.g9e33072/PKG-INFO 2013-08-09
14:47:21.000000000 +0200
+++ new/python-ceilometerclient-1.0.3.4.gb58d4ef/PKG-INFO 2013-09-12
01:12:58.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-ceilometerclient
-Version: 1.0.2.10.g9e33072
+Version: 1.0.3.4.gb58d4ef
Summary: OpenStack Metering API Client Library
Home-page: http://www.openstack.org/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-ceilometerclient-1.0.2.10.g9e33072/ceilometerclient/tests/v2/test_alarms.py
new/python-ceilometerclient-1.0.3.4.gb58d4ef/ceilometerclient/tests/v2/test_alarms.py
---
old/python-ceilometerclient-1.0.2.10.g9e33072/ceilometerclient/tests/v2/test_alarms.py
2013-08-09 14:46:49.000000000 +0200
+++
new/python-ceilometerclient-1.0.3.4.gb58d4ef/ceilometerclient/tests/v2/test_alarms.py
2013-09-12 01:12:15.000000000 +0200
@@ -30,7 +30,7 @@
u'evaluation_periods': 2,
u'timestamp': u'2013-05-09T13:41:23.085000',
u'enabled': True,
- u'counter_name': u'storage.objects',
+ u'meter_name': u'storage.objects',
u'period': 240.0,
u'alarm_id': u'alarm-id',
u'state': u'ok',
@@ -49,6 +49,7 @@
del CREATE_ALARM['alarm_id']
DELTA_ALARM = {u'alarm_actions': ['url1', 'url2'],
u'comparison_operator': u'lt',
+ u'meter_name': u'foobar',
u'threshold': 42.1}
UPDATED_ALARM = copy.deepcopy(AN_ALARM)
UPDATED_ALARM.update(DELTA_ALARM)
@@ -144,11 +145,38 @@
self.assertEqual(self.api.calls, expect)
self.assertTrue(alarm)
+ def test_create_legacy(self):
+ create = {}
+ create.update(CREATE_ALARM)
+ create['counter_name'] = CREATE_ALARM['meter_name']
+ del create['meter_name']
+ alarm = self.mgr.create(**create)
+ expect = [
+ ('POST', '/v2/alarms', {}, CREATE_ALARM),
+ ]
+ self.assertEqual(self.api.calls, expect)
+ self.assertTrue(alarm)
+
def test_update(self):
alarm = self.mgr.update(alarm_id='alarm-id', **DELTA_ALARM)
expect = [
('PUT', '/v2/alarms/alarm-id', {}, DELTA_ALARM),
]
+ self.assertEqual(self.api.calls, expect)
+ self.assertTrue(alarm)
+ self.assertEqual(alarm.alarm_id, 'alarm-id')
+ for (key, value) in DELTA_ALARM.iteritems():
+ self.assertEqual(getattr(alarm, key), value)
+
+ def test_update_legacy(self):
+ delta = {}
+ delta.update(DELTA_ALARM)
+ delta['counter_name'] = DELTA_ALARM['meter_name']
+ del delta['meter_name']
+ alarm = self.mgr.update(alarm_id='alarm-id', **delta)
+ expect = [
+ ('PUT', '/v2/alarms/alarm-id', {}, DELTA_ALARM),
+ ]
self.assertEqual(self.api.calls, expect)
self.assertTrue(alarm)
self.assertEqual(alarm.alarm_id, 'alarm-id')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-ceilometerclient-1.0.2.10.g9e33072/ceilometerclient/v2/alarms.py
new/python-ceilometerclient-1.0.3.4.gb58d4ef/ceilometerclient/v2/alarms.py
--- old/python-ceilometerclient-1.0.2.10.g9e33072/ceilometerclient/v2/alarms.py
2013-08-09 14:46:49.000000000 +0200
+++ new/python-ceilometerclient-1.0.3.4.gb58d4ef/ceilometerclient/v2/alarms.py
2013-09-12 01:12:15.000000000 +0200
@@ -16,6 +16,8 @@
# License for the specific language governing permissions and limitations
# under the License.
+import warnings
+
from ceilometerclient.common import base
from ceilometerclient.v2 import options
@@ -26,7 +28,7 @@
'evaluation_periods',
'state',
'enabled',
- 'counter_name',
+ 'meter_name',
'statistic',
'comparison_operator',
'threshold',
@@ -60,12 +62,22 @@
except IndexError:
return None
+ @staticmethod
+ def _compat_counter_rename_kwargs(kwargs):
+ # NOTE(jd) Compatibility with Havana-2 API
+ if 'counter_name' in kwargs:
+ warnings.warn("counter_name has been renamed to meter_name",
+ DeprecationWarning)
+ kwargs['meter_name'] = kwargs['counter_name']
+
def create(self, **kwargs):
+ self._compat_counter_rename_kwargs(kwargs)
new = dict((key, value) for (key, value) in kwargs.items()
if key in CREATION_ATTRIBUTES)
return self._create(self._path(), new)
def update(self, alarm_id, **kwargs):
+ self._compat_counter_rename_kwargs(kwargs)
updated = dict((key, value) for (key, value) in kwargs.items()
if key in UPDATABLE_ATTRIBUTES)
return self._update(self._path(alarm_id), updated)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-ceilometerclient-1.0.2.10.g9e33072/ceilometerclient/v2/shell.py
new/python-ceilometerclient-1.0.3.4.gb58d4ef/ceilometerclient/v2/shell.py
--- old/python-ceilometerclient-1.0.2.10.g9e33072/ceilometerclient/v2/shell.py
2013-08-09 14:46:49.000000000 +0200
+++ new/python-ceilometerclient-1.0.3.4.gb58d4ef/ceilometerclient/v2/shell.py
2013-09-12 01:12:15.000000000 +0200
@@ -79,10 +79,10 @@
@utils.arg('--project-id', metavar='<PROJECT_ID>',
- help='Tenant to associate with alarm '
+ help='Tenant to associate with sample '
'(only settable by admin users)')
@utils.arg('--user-id', metavar='<USER_ID>',
- help='User to associate with alarm '
+ help='User to associate with sample '
'(only settable by admin users)')
@utils.arg('-r', '--resource-id', metavar='<RESOURCE_ID>',
help='ID of the resource.')
@@ -136,7 +136,7 @@
field_labels = ['Name', 'Description', 'Metric', 'Period', 'Count',
'Threshold', 'Comparison', 'State', 'Enabled', 'Alarm ID',
'User ID', 'Project ID']
- fields = ['name', 'description', 'counter_name', 'period',
+ fields = ['name', 'description', 'meter_name', 'period',
'evaluation_periods', 'threshold', 'comparison_operator',
'state', 'enabled', 'alarm_id', 'user_id', 'project_id']
utils.print_list(alarms, fields, field_labels,
@@ -144,7 +144,7 @@
def _display_alarm(alarm):
- fields = ['name', 'description', 'counter_name', 'period',
+ fields = ['name', 'description', 'meter_name', 'period',
'evaluation_periods', 'threshold', 'comparison_operator',
'state', 'enabled', 'alarm_id', 'user_id', 'project_id',
'alarm_actions', 'ok_actions', 'insufficient_data_actions',
@@ -185,7 +185,7 @@
help='State of the alarm, one of: ' + str(ALARM_STATES))
@utils.arg('--enabled', type=utils.string_to_bool, metavar='{True|False}',
help='True if alarm evaluation/actioning is enabled')
[email protected]('--counter-name', metavar='<METRIC>',
[email protected]('--meter-name', metavar='<METRIC>',
help='Metric to evaluate against')
@utils.arg('--statistic', metavar='<STATISTIC>',
help='Statistic to evaluate, one of: ' + str(STATISTICS))
@@ -212,7 +212,7 @@
@utils.arg('--matching-metadata', dest='matching_metadata',
metavar='<Matching Metadata>', action='append', default=None,
help=('A meter should match this resource metadata (key=value) '
- 'additionally to the counter_name'))
+ 'additionally to the meter_name'))
def do_alarm_create(cc, args={}):
'''Create a new alarm.'''
fields = dict(filter(lambda x: not (x[1] is None), vars(args).items()))
@@ -233,7 +233,7 @@
help='State of the alarm, one of: ' + str(ALARM_STATES))
@utils.arg('--enabled', type=utils.string_to_bool, metavar='{True|False}',
help='True if alarm evaluation/actioning is enabled')
[email protected]('--counter-name', metavar='<METRIC>',
[email protected]('--meter-name', metavar='<METRIC>',
help='Metric to evaluate against')
@utils.arg('--statistic', metavar='<STATISTIC>',
help='Statistic to evaluate, one of: ' + str(STATISTICS))
@@ -260,7 +260,7 @@
@utils.arg('--matching-metadata', dest='matching_metadata',
metavar='<Matching Metadata>', action='append', default=None,
help=('A meter should match this resource metadata (key=value) '
- 'additionally to the counter_name'))
+ 'additionally to the meter_name'))
def do_alarm_update(cc, args={}):
'''Update an existing alarm.'''
fields = dict(filter(lambda x: not (x[1] is None), vars(args).items()))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-ceilometerclient-1.0.2.10.g9e33072/python_ceilometerclient.egg-info/PKG-INFO
new/python-ceilometerclient-1.0.3.4.gb58d4ef/python_ceilometerclient.egg-info/PKG-INFO
---
old/python-ceilometerclient-1.0.2.10.g9e33072/python_ceilometerclient.egg-info/PKG-INFO
2013-08-09 14:47:21.000000000 +0200
+++
new/python-ceilometerclient-1.0.3.4.gb58d4ef/python_ceilometerclient.egg-info/PKG-INFO
2013-09-12 01:12:57.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-ceilometerclient
-Version: 1.0.2.10.g9e33072
+Version: 1.0.3.4.gb58d4ef
Summary: OpenStack Metering API Client Library
Home-page: http://www.openstack.org/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-ceilometerclient-1.0.2.10.g9e33072/tox.ini
new/python-ceilometerclient-1.0.3.4.gb58d4ef/tox.ini
--- old/python-ceilometerclient-1.0.2.10.g9e33072/tox.ini 2013-08-09
14:46:49.000000000 +0200
+++ new/python-ceilometerclient-1.0.3.4.gb58d4ef/tox.ini 2013-09-12
01:12:15.000000000 +0200
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,pep8
+envlist = py26,py27,pypy,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
