diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py index beee8b8af..54325248d 100644 --- a/ceilometer/api/controllers/v2.py +++ b/ceilometer/api/controllers/v2.py @@ -1434,7 +1434,7 @@ class AlarmController(rest.RestController): def put(self, data): """Modify this alarm. - :param data: a alarm within the request body. + :param data: an alarm within the request body. """ # Ensure alarm exists alarm_in = self._alarm() @@ -1508,7 +1508,7 @@ class AlarmController(rest.RestController): def put_state(self, state): """Set the state of this alarm. - :param state: a alarm state within the request body. + :param state: an alarm state within the request body. """ # note(sileht): body are not validated by wsme # Workaround for https://bugs.launchpad.net/wsme/+bug/1227229 @@ -1572,7 +1572,7 @@ class AlarmsController(rest.RestController): def post(self, data): """Create a new alarm. - :param data: a alarm within the request body. + :param data: an alarm within the request body. """ conn = pecan.request.storage_conn now = timeutils.utcnow() diff --git a/ceilometer/storage/impl_log.py b/ceilometer/storage/impl_log.py index 5d03405c4..7a36b9165 100644 --- a/ceilometer/storage/impl_log.py +++ b/ceilometer/storage/impl_log.py @@ -176,4 +176,4 @@ class Connection(base.Connection): return alarm def delete_alarm(self, alarm_id): - """Delete a alarm.""" + """Delete an alarm.""" diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py index 7ca143838..6c8314f11 100644 --- a/ceilometer/storage/impl_mongodb.py +++ b/ceilometer/storage/impl_mongodb.py @@ -922,7 +922,7 @@ class Connection(base.Connection): create_alarm = update_alarm def delete_alarm(self, alarm_id): - """Delete a alarm + """Delete an alarm """ self.db.alarm.remove({'alarm_id': alarm_id}) diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index 24e48112b..e406c8313 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -720,7 +720,7 @@ class Connection(base.Connection): return self._row_to_alarm_model(alarm_row) def delete_alarm(self, alarm_id): - """Delete a alarm + """Delete an alarm :param alarm_id: ID of the alarm to delete """ diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/api/v2/test_alarm_scenarios.py index eec679fa8..d05d6be95 100644 --- a/ceilometer/tests/api/v2/test_alarm_scenarios.py +++ b/ceilometer/tests/api/v2/test_alarm_scenarios.py @@ -689,7 +689,7 @@ class TestAlarms(FunctionalTest, def test_post_combination_alarm_as_user_with_unauthorized_alarm(self): """Test that post a combination alarm as normal user/project - with a alarm_id unauthorized for this project/user + with an alarm_id unauthorized for this project/user """ json = { 'enabled': False, @@ -716,7 +716,7 @@ class TestAlarms(FunctionalTest, def test_post_combination_alarm_as_admin_on_behalf_of_an_other_user(self): """Test that post a combination alarm as admin on behalf of an other - user/project with a alarm_id unauthorized for this project/user + user/project with an alarm_id unauthorized for this project/user """ json = { 'enabled': False, @@ -753,7 +753,7 @@ class TestAlarms(FunctionalTest, def _do_post_combination_alarm_as_admin_success(self, owner_is_set): """Test that post a combination alarm as admin on behalf of nobody - with a alarm_id of someone else, with owner set or not + with an alarm_id of someone else, with owner set or not """ json = { 'enabled': False,