better checks for attributes

ldapcherry/attributes.py

@@ -10,7 +10,7 @@ import sys
 
 from ldapcherry.pyyamlwrapper import loadNoDump
 from ldapcherry.pyyamlwrapper import DumplicatedKey
-from ldapcherry.exceptions import MissingAttributesFile, MissingKey
+from ldapcherry.exceptions import MissingAttributesFile, MissingKey, WrongAttributeType
 from sets import Set
 import yaml
 
@@ -32,6 +32,9 @@ class Attributes:
 
         for attrid in self.attributes:
             self._mandatory_check(attrid)
+            attr = self.attributes[attrid]
+            if not attr['type'] in types:
+                raise WrongAttributeType(attr['type'], attrid, attributes_file)
 
     def _mandatory_check(self, attr):
         for m in ['description', 'display_name', 'type', 'backend-attributes']:

ldapcherry/exceptions.py

@@ -43,3 +43,12 @@ class MissingAttributesFile(Exception):
     def __init__(self, attributesfile):
         self.attributesfile = attributesfile
         self.log = "fail to open attributes file <%(attributesfile)s>" % { 'attributesfile' : attributesfile}
+
+class WrongAttributeType(Exception):
+    def __init__(self, key, section, ymlfile):
+        self.key = key
+        self.section = section
+        self.ymlfile = ymlfile
+        self.log = "wrong attribute type <%(key)s> in section <%(section)s> inside file <%(ymlfile)s>" % {'key': key, 'section': section, 'ymlfile': ymlfile } 
+
+

tests/cfg/attributes_wrong_type.yml

@@ -0,0 +1,20 @@
+cn:
+    description: "Firt Name and Display Name"
+    display_name: "Display Name"
+    type: notatype
+    autofill: 
+        function: cn
+        args:
+            - $first-name
+            - $name
+    backend-attributes:
+        ldap: cn
+        ad: CN
+
+first-name:
+    description: "First name of the user"
+    display_name: "First Name"
+    type: string
+    backend-attributes:
+        ldap: givenName
+        ad: givenName

tests/test_Attributes.py

@@ -8,7 +8,7 @@ import pytest
 import sys
 from sets import Set
 from ldapcherry.attributes import Attributes
-from ldapcherry.exceptions import MissingAttributesFile, MissingKey
+from ldapcherry.exceptions import MissingAttributesFile, MissingKey, WrongAttributeType
 from ldapcherry.pyyamlwrapper import DumplicatedKey, RelationError
 
 class TestError(object):
@@ -33,27 +33,16 @@ class TestError(object):
         else:
             raise AssertionError("expected an exception")
 
-#    def testAttrKeyDuplication(self):
+    def testWrongType(self):
-#        try:
+        try:
-#            inv = Attributes('./tests/cfg/attributes_key_dup.yml')
+            inv = Attributes('./tests/cfg/attributes_wrong_type.yml')
-#        except DumplicateAttrKey:
+        except WrongAttributeType:
-#            return
+            return
-#        else:
+        else:
-#            raise AssertionError("expected an exception")
+            raise AssertionError("expected an exception")
-#
 
-#    def testGetDisplayNameMissingAttr(self):
-#        inv = Attributes('./tests/cfg/attributes.yml')
-#        try:
-#            res = inv.get_display_name('notarole')
-#        except MissingAttr:
-#            return
-#        else:
-#            raise AssertionError("expected an exception")
-#
 #    def testGetDisplayName(self):
 #        inv = Attributes('./tests/cfg/attributes.yml')
 #        res = inv.get_display_name('users')
 #        expected = 'Simple Users'
 #        assert res == expected
-#