Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

[sfa.git] / sfa / trust / gid.py

diff --git a/sfa/trust/gid.py b/sfa/trust/gid.py
index 4f48270..6f39989 100644 (file)
--- a/sfa/trust/gid.py
+++ b/sfa/trust/gid.py
@@ -66,11 +66,6 @@ def create_uuid():
 
 
 class GID(Certificate):
-    uuid = None
-    hrn = None
-    urn = None
-    email = None # for adding to the SubjectAltName
-
     ##
     # Create a new GID object
     #
@@ -79,10 +74,15 @@ class GID(Certificate):
     # @param string If string!=None, load the GID from a string
     # @param filename If filename!=None, load the GID from a file
     # @param lifeDays life of GID in days - default is 1825==5 years
+    # @param email Email address to put in subjectAltName - default is None
 
-    def __init__(self, create=False, subject=None, string=None, filename=None, uuid=None, hrn=None, urn=None, lifeDays=1825):
-        
+    def __init__(self, create=False, subject=None, string=None, filename=None, uuid=None, hrn=None, urn=None, lifeDays=1825, email=None):
+        self.uuid = None
+        self.hrn = None
+        self.urn = None
+        self.email = None # for adding to the SubjectAltName             
         Certificate.__init__(self, lifeDays, create, subject, string, filename)
+
         if subject:
             logger.debug("Creating GID for subject: %s" % subject)
         if uuid:
@@ -94,6 +94,10 @@ class GID(Certificate):
             self.urn = urn
             self.hrn, type = urn_to_hrn(urn)
 
+        if email:
+            logger.debug("Creating GID for subject using email: %s" % email)
+            self.set_email(email)
+
     def set_uuid(self, uuid):
         if isinstance(uuid, str):
             self.uuid = int(uuid)