From: Thierry Parmentelat Date: Wed, 14 May 2014 12:16:23 +0000 (+0200) Subject: change naming scheme for credentials held by clientbootstrap (and thus sfi) X-Git-Tag: sfa-3.1-5~27 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=ef36bca90234ba3b96b0e83a3f81f59e0925587a change naming scheme for credentials held by clientbootstrap (and thus sfi) so that we can store credentials for different users, so that sfi -u works as expected --- diff --git a/sfa/client/sfaclientlib.py b/sfa/client/sfaclientlib.py index f4fe3a8d..78f6f48d 100644 --- a/sfa/client/sfaclientlib.py +++ b/sfa/client/sfaclientlib.py @@ -276,8 +276,14 @@ class SfaClientBootstrap: return self.fullpath ("%s.sscert"%self.hrn) def my_credential_filename (self): return self.credential_filename (self.hrn, "user") + # the tests use sfi -u ; meaning that the slice credential filename + # needs to keep track of the user too def credential_filename (self, hrn, type): - return self.fullpath ("%s.%s.cred"%(hrn,type)) + if type in ['user']: + basename="%s.%s.cred"%(hrn,type) + else: + basename="%s-%s.%s.cred"%(self.hrn,hrn,type) + return self.fullpath (basename) def slice_credential_filename (self, hrn): return self.credential_filename(hrn,'slice') def authority_credential_filename (self, hrn):