openstack/vitrage
Code Issues Proposed changes

restore checking the action about alarm with 'ok' state

Browse Source 
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>

Change-Id: Ie43a56a321ebfed639aba4a67aaa46e61604b40b
This commit is contained in:
dongwenjuan 2016-11-29 17:30:37 +08:00
parent cd8db295d4
commit 074d1196a2
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vitrage/tests/unit/datasources/nagios/test_nagios_driver.py
View File

@ -144,6 +144,9 @@ class NagiosDriverTest(NagiosBaseTest):
self.assertEqual(2, len(services))
self._assert_contains(service_data1, services)
self._assert_contains(service_data2, services)
for service in services:
self.assertEqual(GraphAction.DELETE_ENTITY,
service[DSProps.EVENT_TYPE])
# Action
services = nagios_driver._get_all_alarms()
@ -275,6 +278,9 @@ class NagiosDriverTest(NagiosBaseTest):
self.assertEqual(2, len(services))
self._assert_contains(service_data1, services)
self._assert_contains(service_data2, services)
for service in services:
self.assertEqual(GraphAction.DELETE_ENTITY,
service[DSProps.EVENT_TYPE])
# Action
services = nagios_driver._get_changed_alarms()

6
vitrage/tests/unit/datasources/zabbix/test_zabbix_driver.py
View File

@ -143,6 +143,9 @@ class ZabbixDriverTest(ZabbixBaseTest):
self.assertEqual(2, len(alarms))
self._assert_contains(expected_alarm1, alarms)
self._assert_contains(expected_alarm2, alarms)
for alarm in alarms:
self.assertEqual(GraphAction.DELETE_ENTITY,
alarm[DSProps.EVENT_TYPE])
# Step 4 - get all when all alarms are inactivated and their status
# was not changed
@ -251,6 +254,9 @@ class ZabbixDriverTest(ZabbixBaseTest):
self.assertEqual(2, len(alarms))
self._assert_contains(expected_alarm1, alarms)
self._assert_contains(expected_alarm2, alarms)
for alarm in alarms:
self.assertEqual(GraphAction.DELETE_ENTITY,
alarm[DSProps.EVENT_TYPE])
# Step 6 - get changes when no change occurred
# Action