Fix: #603 host to host servicedependecies

Using auto-computing of servicedependencies

Author: Quentin Bouget

shinken/objects/servicedependency.py

@@ -181,7 +181,7 @@ def explode(self, hostgroups, services):
                     dep_hnames.extend([m.strip() for m in hg.members])
 
             if not hasattr(sd, 'dependent_host_name'):
-                sd.dependent_host_name = getattr(sd, 'host_name', '')
+                sd.dependent_host_name = ''
 
             if sd.dependent_host_name != '':
                 dep_hnames.extend([n.strip() for n in sd.dependent_host_name.split(',')])
@@ -214,6 +214,13 @@ def explode(self, hostgroups, services):
                     sname = service.service_description
                     if sname in snames:
                         special_singles[sname].add(service.host_name)
+                if hnames:
+                    # host_names without dependent_host_names
+                    # => host to host dependencies
+                    for sname in snames:
+                        # Should log something when a host does not
+                        # match any service
+                        special_singles[sname] &= set(hnames)
 
                 special_dep_singles = {}
                 for sname in dep_snames:

test/etc/servicedependency_auto_computing/hosts.cfg

@@ -33,3 +33,21 @@ define host {
     host_name   h5
     address     127.0.0.6
 }
+
+define host {
+    use         generic-host
+    host_name   h6
+    address     127.0.0.7
+}
+
+define host {
+    use         generic-host
+    host_name   h7
+    address     127.0.0.8
+}
+
+define host {
+    use         generic-host
+    host_name   h8
+    address     127.0.0.9
+}

test/etc/servicedependency_auto_computing/servicedependencies.cfg

@@ -12,3 +12,9 @@ define servicedependency{
     service_description svc0
     dependent_service_description svc3
 }
+
+define servicedependency{
+    host_name h6, h7
+    service_description svc4
+    dependent_service_description svc5
+}

test/etc/servicedependency_auto_computing/services.cfg

@@ -51,3 +51,17 @@ define service {
     check_command       nothing
     host_name           h3, h4, h5
 }
+
+define service {
+    use                 generic-service
+    service_description svc4
+    check_command       nothing
+    host_name           h6, h7, h8
+}
+
+define service {
+    use                 generic-service
+    service_description svc5
+    check_command       nothing
+    host_name           h6, h7, h8
+}

test/test_servicedependency_auto_computing.py

@@ -54,7 +54,7 @@ def test_matching_svc(self):
 
     def test_multiple_srv_description(self):
         services = self.conf.services
-        expected_dep_svc = {'h1': ['svc2'], 'h2': ['svc2'],\
+        expected_dep_svc = {'h1': ['svc2'], 'h2': ['svc2'],
                             'h3': ['svc2', 'svc3'], 'h4': ['svc2', 'svc3']}
         svcs = []
         svcs.append(services.find_srv_by_name_and_hostname('h1', 'svc1'))
@@ -70,6 +70,26 @@ def test_multiple_srv_description(self):
                 description.remove(dep_svc.service_description)
             self.assertEqual(description, [])
 
+    def test_host_to_host_dependency(self):
+        services = self.conf.services
+        servicedependencies = self.conf.servicedependencies
+        svcs = []
+        svcs.append(services.find_srv_by_name_and_hostname('h6', 'svc4'))
+        svcs.append(services.find_srv_by_name_and_hostname('h7', 'svc4'))
+        for svc in svcs:
+            self.assertIsNotNone(svc)
+            dep_svcs = [info_dep[0] for info_dep in svc.act_depend_of_me]
+            self.assertNotEqual(dep_svcs, [])
+            for dep_svc in dep_svcs:
+                self.assertEqual(dep_svc.host_name, svc.host_name)
+                self.assertEqual(dep_svc.service_description, 'svc5')
+
+        # Check that host8 was not caught in the process
+        h8_svc4 = services.find_srv_by_name_and_hostname('h8', 'svc4')
+
+        self.assertIsNotNone(h8_svc4)
+        self.assertFalse(h8_svc4.act_depend_of_me)
+
 
 if __name__ == '__main__':
     unittest.main()