From 5ddf85983a330da73f6a1b9b5dac10b768e19261 Mon Sep 17 00:00:00 2001 From: Sahina Bose Date: Mon, 5 May 2014 12:00:51 +0530 Subject: nagios-server: Added quorum service to auto config Added a quorum service to auto-config generator. Renamed "Volume Status Quota" to "Volume Quota" service Change-Id: Id83eefeee63bf7c34373196f4cfa2b326e1cb71d Signed-off-by: Sahina Bose Reviewed-on: http://review.gluster.org/7661 Reviewed-by: Kanagaraj M Reviewed-by: Ramesh N --- tests/test_config_generator.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test_config_generator.py b/tests/test_config_generator.py index ea41e7d..e0fd8bc 100644 --- a/tests/test_config_generator.py +++ b/tests/test_config_generator.py @@ -65,7 +65,12 @@ class TestGlusterNagiosConfManager(TestCaseBase): self._verifyClusterServices(config, clusterData) def _verifyClusterServices(self, clusterConfig, clusterData): - self.assertEqual(len(clusterConfig['host_services']), 7) + self.assertEqual(len(clusterConfig['host_services']), 8) + serviceDesc = 'Cluster - Quorum' + service = self._findServiceInList(clusterConfig['host_services'], + serviceDesc) + self.assertNotEqual(service, None, + "Cluster Quorum service is not created") for volume in clusterData['volumes']: self._verifyVolumeServices(clusterConfig['host_services'], volume) @@ -78,7 +83,7 @@ class TestGlusterNagiosConfManager(TestCaseBase): service = self._findServiceInList(serviceList, serviceDesc) self.assertNotEqual(service, None, "Volume Status service is not created") - serviceDesc = 'Volume Status Quota - %s' % (volume['name']) + serviceDesc = 'Volume Quota - %s' % (volume['name']) service = self._findServiceInList(serviceList, serviceDesc) self.assertNotEqual(service, None, "Volume Status Quota service is not created") -- cgit