Changeset 6805 for TI12-security/trunk/NDG_XACML/ndg/xacml/core/functions/__init__.py

Timestamp:

14/04/10 15:45:01 (11 years ago)

Author:

pjkersha

Message:

Working <Condition> statement processing. This means that policy rules can now be evaluated. The rule combining algorithm handling needs to be implemented to complete the PDP processing.

File:

• TI12-security/trunk/NDG_XACML/ndg/xacml/core/functions/__init__.py (modified) (3 diffs)

TI12-security/trunk/NDG_XACML/ndg/xacml/core/functions/__init__.py

@@ -16 +16 @@
 log = logging.getLogger(__name__)
 
-from ndg.xacml.core.attributevalue import AttributeValue
+from ndg.xacml.core.attributevalue import (AttributeValue, 
+                                           AttributeValueClassFactory)
 from ndg.xacml.utils import VettedDict, _isIterable
 from ndg.xacml.utils.factory import callModuleObject
@@ -349 +350 @@
                                   for n in functionSuffixParts if n])
         
+        attributeValueClassFactory = AttributeValueClassFactory()
+        
         for identifier in self.__class__.FUNCTION_NAMES:            
             # Extract the function name and the type portion of the function
@@ -356 +359 @@
             
             typeName = typePart[0].upper() + typePart[1:]
-            _type = AttributeValue.TYPE_MAP.get(typeName)
+            typeURI = AttributeValue.IDENTIFIER_PREFIX + typePart
+            _type = attributeValueClassFactory(typeURI)
             if _type is None:
                 raise TypeError('No AttributeValue.TYPE_MAP entry for %r type' %