X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fapi-dev.py;h=52411592baf2a652b72903aaf3c6bc5113c7a843;hb=cb83b38f6586314d51e23dad227047d126bd4b76;hp=29b0cc808953da11b395503f519d65134af22c15;hpb=952322d76247f8991f3c2688ed7e1f5a22ca4572;p=sfa.git diff --git a/sfa/plc/api-dev.py b/sfa/plc/api-dev.py index 29b0cc80..52411592 100644 --- a/sfa/plc/api-dev.py +++ b/sfa/plc/api-dev.py @@ -10,17 +10,17 @@ import os import traceback import string import xmlrpclib + +from sfa.util.sfalogging import sfa_logger from sfa.trust.auth import Auth from sfa.util.config import * from sfa.util.faults import * -from sfa.util.debug import * from sfa.trust.rights import * from sfa.trust.credential import * from sfa.trust.certificate import * from sfa.util.namespace import * from sfa.util.api import * from sfa.util.nodemanager import NodeManager -from sfa.util.sfalogging import * from collections import defaultdict @@ -324,7 +324,7 @@ class SfaAPI(BaseAPI): self.hrn = self.config.SFA_INTERFACE_HRN self.time_format = "%Y-%m-%d %H:%M:%S" - self.logger=get_sfa_logger() + self.logger=sfa_logger() def getPLCShell(self): self.plauth = {'Username': self.config.SFA_PLC_USER, @@ -360,9 +360,9 @@ class SfaAPI(BaseAPI): registry = registries[self.hrn] cert_string=self.cert.save_to_string(save_parents=True) # get self credential - self_cred = registry.get_self_credential(cert_string, type, self.hrn) + self_cred = registry.GetSelfCredential(cert_string, self.hrn, type) # get credential - cred = registry.get_credential(self_cred, type, self.hrn) + cred = registry.GetCredential(self_cred, type, self.hrn) # save cred to file Credential(string=cred).save_to_file(cred_filename, save_parents=True)