X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=b4bedf9022e8b3edac5de69e44afcc2b9a28b152;hb=cddc4baa5eee846f4ec96ec348bf7d32facb50d6;hp=7aa313be4f912db56f185296da5673793789553d;hpb=8b713dd6e07a754326fb0b4c5a8037a649f522aa;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 7aa313be..b4bedf90 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -372,13 +372,12 @@ class Sfi: else: # bootstrap user credential cert_string = self.cert.save_to_string(save_parents=True) - request_hash = self.key.compute_hash([cert_string, "user", self.user]) user_name=self.user.replace(self.authority+".", '') if user_name.count(".") > 0: user_name = user_name.replace(".", '_') self.user=self.authority + "." + user_name - user_cred = self.registry.get_self_credential(cert_string, "user", self.user, request_hash) + user_cred = self.registry.get_self_credential(cert_string, "user", self.user) if user_cred: cred = Credential(string=user_cred) cred.save_to_file(file, save_parents=True) @@ -832,7 +831,7 @@ class Sfi: try: cm_port = "12346" url = "https://%(hostname)s:%(cm_port)s" % locals() - print "Calling get_ticket at %(url)s " % locals(), + print "Calling redeem_ticket at %(url)s " % locals(), cm = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file) cm.redeem_ticket(slice_cred, ticket.save_to_string(save_parents=True)) print "Success"