Improve contactgroup tests

alignak/objects/contactgroup.py

@@ -56,7 +56,7 @@
 """
 from alignak.objects.itemgroup import Itemgroup, Itemgroups
 
-from alignak.property import StringProp
+from alignak.property import StringProp, ListProp
 from alignak.log import logger
 
 
@@ -71,7 +71,8 @@ class Contactgroup(Itemgroup):
         'uuid':                 StringProp(default='', fill_brok=['full_status']),
         'contactgroup_name':    StringProp(fill_brok=['full_status']),
         'alias':                StringProp(fill_brok=['full_status']),
-        'contactgroup_members': StringProp(fill_brok=['full_status']),
+        'contactgroup_members': ListProp(default=[], fill_brok=['full_status'],
+                                         merging='join', split_on_coma=True)
     })
 
     macros = {
@@ -102,18 +103,13 @@ def get_name(self):
 
     def get_contactgroup_members(self):
         """
-        Get contactgroup members
+        Get list of groups members of this contactgroup
 
-        :return: list of hosts
+        :return: list of contacts
         :rtype: list
         """
-        # TODO: imho a Contactgroup instance should always have defined
-        # its contactgroup_members attribute, even if it's empty / the empty list.
         if hasattr(self, 'contactgroup_members'):
-            # more over: it should already be in the list form,
-            # not anymore in the "bare" string from as read
-            # from configuration (files or db or whatever)
-            return [m.strip() for m in self.contactgroup_members.split(',')]
+            return self.contactgroup_members
         else:
             return []
 

test/cfg/contactgroup/alignak_contactgroup_members.cfg

@@ -0,0 +1,22 @@
+cfg_dir=../default
+
+define contact{
+    contact_name                    test_contact_2
+    alias                           Second contact alias
+    service_notification_period     24x7
+    host_notification_period        24x7
+    service_notification_options    w,u,c,r,f
+    host_notification_options       d,u,r,f,s
+    service_notification_commands   notify-service
+    host_notification_commands      notify-host
+    email                           nobody@localhost
+    can_submit_commands             0
+    ; contactgroups                   another_contact_test
+}
+
+define contactgroup {
+    contactgroup_name       allcontacts_and_groups
+    alias                   All: Contacts and groups
+    members                 test_contact, test_contact_2
+    contactgroup_members    test_contact
+}

test/cfg/contactgroup/alignak_contactgroup_no_contact.cfg

@@ -0,0 +1,6 @@
+cfg_dir=../default
+
+define contactgroup {
+    contactgroup_name       void
+    alias                   Void group
+}

test/cfg/contactgroup/alignak_contactgroup_with_space.cfg

@@ -0,0 +1,6 @@
+cfg_dir=../default
+
+define contactgroup {
+    contactgroup_name       test_With Spaces
+    members                 test_contact
+}

test/cfg/contactgroup/alignak_contactgroup_with_void_member.cfg

@@ -0,0 +1,35 @@
+cfg_dir=../default
+
+define hostgroup{
+   hostgroup_name MYGROUP
+   members h1,h2,
+}
+
+
+define host{
+       host_name	h1
+       use		generic-host
+}
+
+define host{
+       host_name	h2
+       use		generic-host
+}
+
+
+
+define contactgroup{
+       contactgroup_name	SPACEMARINES
+       members			m1 , m2 ,
+}
+
+
+define contact{
+       contact_name	m1
+       use		generic-contact
+}
+
+define contact{
+       contact_name	m2
+       use		generic-contact
+}

test/_old/etc/alignak_contactgroups_plus_inheritance.cfg → test/cfg/contactgroup/alignak_contactgroups_plus_inheritance.cfg

@@ -1,3 +1,5 @@
+cfg_dir=../default
+
 define contactgroup{
     contactgroup_name       test_contact_1
     alias                   test_contacts_alias_1

test/cfg/contactgroup/alignak_groups_with_no_alias.cfg

@@ -0,0 +1,4 @@
+
+define contactgroup {
+    contactgroup_name       NOALIAS
+}