X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fapi.py;h=5af31ec23bc9497d06c5d988161ca6989bcfb399;hb=c3c6bd1c3ce8cb5f242bd175cc84608a0a7f8015;hp=855b0a9ba83f3f2a5d6d91f53ed2f3e493be199a;hpb=c41c6c1a978298b1379fa5bf99c0dc0b2a902f3c;p=sfa.git diff --git a/sfa/plc/api.py b/sfa/plc/api.py index 855b0a9b..5af31ec2 100644 --- a/sfa/plc/api.py +++ b/sfa/plc/api.py @@ -170,7 +170,6 @@ class GeniAPI: else: return self.getCredentialFromRegistry() - def getCredentialFromRegistry(self): """ Get our credential from a remote registry using a geniclient connection @@ -181,15 +180,16 @@ class GeniAPI: cred_filename = path + os.sep + filename try: credential = Credential(filename = cred_filename) - return credential + return credential.save_to_string(save_parents=True) except IOError: from sfa.server.registry import Registries registries = Registries(self) registry = registries[self.hrn] + cert_string=self.cert.save_to_string(save_parents=True) # get self credential - arg_list = [None,type,self.hrn] + arg_list = [cert_string,type,self.hrn] request_hash=self.key.compute_hash(arg_list) - self_cred = registry.get_credential(None, type, self.hrn, request_hash) + self_cred = registry.get_self_credential(cert_string, type, self.hrn, request_hash) # get credential arg_list = [self_cred,type,self.hrn] request_hash=self.key.compute_hash(arg_list)