From: Josh Karlin <jkarlin@bbn.com>
Date: Wed, 6 Oct 2010 20:44:13 +0000 (-0400)
Subject: fixing email and added a necessary import to credential
X-Git-Tag: sfa-1.0-2~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=71691622ac72ca684be69e971f6d58c6a2ccb8ee;p=sfa.git

fixing email and added a necessary import to credential
---

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index ae4215a8..8a30f1cb 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -70,7 +70,7 @@ def __get_registry_objects(slice_xrn, creds, users):
         for user in users:
             user['key_ids'] = []
             hrn, _ = urn_to_hrn(user['urn'])
-            user['email'] = hrn + "@geni.net"
+            user['email'] = hrn_to_pl_slicename(hrn) + "@geni.net"
             user['first_name'] = hrn
             user['last_name'] = hrn
             reg_objects['users'][user['email']] = user
diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index ebecedb0..4971cdd0 100644
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -41,6 +41,7 @@ from sfa.trust.certificate import Keypair
 from sfa.trust.credential_legacy import CredentialLegacy
 from sfa.trust.rights import Right, Rights
 from sfa.trust.gid import GID
+from sfa.util.namespace import *
 
 # Two years, in seconds 
 DEFAULT_CREDENTIAL_LIFETIME = 60 * 60 * 24 * 365 * 2