Apply telemetry delete change

Change-Id: I4e1261ad2a841e81120e1bb030ab606edb8df832
This commit is contained in:
Brian Curtin
2015-04-17 14:41:16 -05:00
parent 11ce1af486
commit f3fa27aa03
2 changed files with 19 additions and 4 deletions

View File

@@ -25,8 +25,20 @@ class Proxy(proxy.BaseProxy):
def create_alarm(self, **data):
return alarm.Alarm(data).create(self.session)
def delete_alarm(self, **data):
alarm.Alarm(data).delete(self.session)
def delete_alarm(self, value, ignore_missing=True):
"""Delete an alarm
:param value: The value can be either the ID of an alarm or a
:class:`~openstack.telemetry.v2.alarm.Alarm` instance.
:param bool ignore_missing: When set to ``False``
:class:`~openstack.exceptions.ResourceNotFound` will be
raised when the alarm does not exist.
When set to ``True``, no exception will be set when
attempting to delete a nonexistent server.
:returns: ``None``
"""
self._delete(alarm.Alarm, value, ignore_missing)
def find_alarm(self, name_or_id):
return alarm.Alarm.find(self.session, name_or_id)

View File

@@ -11,6 +11,7 @@
# under the License.
from openstack.telemetry.v2 import _proxy
from openstack.telemetry.v2 import alarm
from openstack.tests.unit import test_proxy_base
@@ -34,8 +35,10 @@ class TestTelemetryProxy(test_proxy_base.TestProxyBase):
self.proxy.create_alarm)
def test_alarm_delete(self):
self.verify_delete('openstack.telemetry.v2.alarm.Alarm.delete',
self.proxy.delete_alarm)
self.verify_delete2(alarm.Alarm, self.proxy.delete_alarm, False)
def test_alarm_delete_ignore(self):
self.verify_delete2(alarm.Alarm, self.proxy.delete_alarm, True)
def test_alarm_find(self):
self.verify_find('openstack.telemetry.v2.alarm.Alarm.find',