using method get_self_credential to bootstrap SM credential

[sfa.git] / sfa / plc / api.py

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index 855b0a9..5af31ec 100644 (file)
--- 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)