From 074d1196a2153cb22575e369bd22d5cd7e3d52f4 Mon Sep 17 00:00:00 2001 From: dongwenjuan Date: Tue, 29 Nov 2016 17:30:37 +0800 Subject: [PATCH] restore checking the action about alarm with 'ok' state Signed-off-by: dongwenjuan Change-Id: Ie43a56a321ebfed639aba4a67aaa46e61604b40b --- vitrage/tests/unit/datasources/nagios/test_nagios_driver.py | 6 ++++++ vitrage/tests/unit/datasources/zabbix/test_zabbix_driver.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/vitrage/tests/unit/datasources/nagios/test_nagios_driver.py b/vitrage/tests/unit/datasources/nagios/test_nagios_driver.py index 6b30f1f17..2c16fcaa6 100644 --- a/vitrage/tests/unit/datasources/nagios/test_nagios_driver.py +++ b/vitrage/tests/unit/datasources/nagios/test_nagios_driver.py @@ -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() diff --git a/vitrage/tests/unit/datasources/zabbix/test_zabbix_driver.py b/vitrage/tests/unit/datasources/zabbix/test_zabbix_driver.py index c4f3bcf99..263a3f8f5 100644 --- a/vitrage/tests/unit/datasources/zabbix/test_zabbix_driver.py +++ b/vitrage/tests/unit/datasources/zabbix/test_zabbix_driver.py @@ -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