openstack/aodh
Code Issues Proposed changes

Merge "Replace 'a alarm' by 'an alarm'"

Browse Source
This commit is contained in:
Jenkins 2014-02-07 10:32:49 +00:00 committed by Gerrit Code Review
commit 1d0f44ccec
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/api/controllers/v2.py
View File

@ -1435,7 +1435,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()
@ -1509,7 +1509,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
@ -1573,7 +1573,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()

2
ceilometer/storage/impl_log.py
View File

@ -176,4 +176,4 @@ class Connection(base.Connection):
return alarm
def delete_alarm(self, alarm_id):
"""Delete a alarm."""
"""Delete an alarm."""

2
ceilometer/storage/impl_mongodb.py
View File

@ -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})

2
ceilometer/storage/impl_sqlalchemy.py
View File

@ -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
"""

6
ceilometer/tests/api/v2/test_alarm_scenarios.py
View File

@ -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,