Changeset 6720 for TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/attributeauthority.py

Timestamp:

11/03/10 11:30:36 (11 years ago)

Author:

pjkersha

Message:

• Attribute Authority unit tests now pass with refactored Attribute Authority which has NDG Attribute Certificate and role mapping code removed.
• Now refactoring client unit tests.
• Removed NDG Attribute Certificate and XMLSec unit tests - no longer needed.

File:

• TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/attributeauthority.py (modified) (3 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_server/ndg/security/server/attributeauthority.py

@@ -123 +123 @@
         '__propFileSection',
         '__propPrefix',
+        '__attributeInterface',
         '__attributeInterfaceCfg'
     )
@@ -140 +141 @@
         
         self.__attributeInterfaceCfg = {}
-
+        
+    def __getstate__(self):
+        '''Enable pickling with __slots__'''
+        _dict = {}
+        for attrName in AttributeAuthority.__slots__:
+            # Ugly hack to allow for derived classes setting private member
+            # variables
+            if attrName.startswith('__'):
+                attrName = "_AttributeAuthority" + attrName
+                
+            _dict[attrName] = getattr(self, attrName)
+            
+        return _dict
+  
+    def __setstate__(self, attrDict):
+        '''Enable pickling with __slots__'''
+        for attrName, val in attrDict.items():
+            setattr(self, attrName, val)
+            
+    def _getIssuerName(self):
+        return self.__issuerName
+
+    def _setIssuerName(self, value):
+        if not isinstance(value, basestring):
+            raise TypeError('Expecting string type for "issuerName" attribute; '
+                            'got %r' % type(value))
+        
+        self.__issuerName = value
+
+    issuerName = property(_getIssuerName, _setIssuerName, 
+                          doc="Name of Attribute Authority organisation "
+                              "issuing a response to a query")
+    
     def _getAssertionLifetime(self):
         return self.__assertionLifetime
-
-    def _getAttributeInterface(self):
-        return self.__attributeInterface
 
     def _setAssertionLifetime(self, value):
@@ -156 +186 @@
             raise TypeError('Expecting float, int, long or string type for '
                             '"assertionLifetime"; got %r' % type(value))
+
+    def _getAttributeInterface(self):
+        return self.__attributeInterface
 
     def _setAttributeInterface(self, value):