openstack/aodh
Code Issues Proposed changes

Merge "Fix wrong doc string for meter type"

Browse Source
This commit is contained in:
Jenkins 2014-01-24 21:21:49 +00:00 committed by Gerrit Code Review
commit 1161f8c827
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/storage/impl_log.py
View File

@ -115,7 +115,7 @@ class Connection(base.Connection):
"""Return an iterable of dictionaries containing meter information.
{ 'name': name of the meter,
'type': type of the meter (guage, counter),
'type': type of the meter (gauge, delta, cumulative),
'resource_id': UUID of the resource,
'project_id': UUID of project owning the resource,
'user_id': UUID of user owning the resource,

2
ceilometer/storage/models.py
View File

@ -171,7 +171,7 @@ class Meter(Model):
"""Create a new meter.
:param name: name of the meter
:param type: type of the meter (guage, counter)
:param type: type of the meter (gauge, delta, cumulative)
:param unit: unit of the meter
:param resource_id: UUID of the resource
:param project_id: UUID of project owning the resource

2
ceilometer/tests/alarm/test_singleton_alarm_svc.py
View File

@ -71,7 +71,7 @@ class TestSingletonAlarmService(test.BaseTestCase):
self.singleton._evaluate_assigned_alarms()
self.threshold_eval.evaluate.assert_called_once_with(alarm)
def test_unknown_extention_skipped(self):
def test_unknown_extension_skipped(self):
alarms = [
mock.Mock(type='not_existing_type'),
mock.Mock(type='threshold')