From 71691622ac72ca684be69e971f6d58c6a2ccb8ee Mon Sep 17 00:00:00 2001 From: Josh Karlin Date: Wed, 6 Oct 2010 16:44:13 -0400 Subject: [PATCH] fixing email and added a necessary import to credential --- sfa/managers/aggregate_manager_pl.py | 2 +- sfa/trust/credential.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- 2.45.2