X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfaapi.py;h=48bd21c4d170e535e9ac8f5239c5e15d8bafbaed;hb=72b57a505d68985bb2d603d2eb3378d816f06aca;hp=280bf14ee64919e753d3730f42429721f45e7d4d;hpb=6f0a757c5adf47b4d222cec09514dcd688b93457;p=sfa.git diff --git a/sfa/server/sfaapi.py b/sfa/server/sfaapi.py index 280bf14e..48bd21c4 100644 --- a/sfa/server/sfaapi.py +++ b/sfa/server/sfaapi.py @@ -37,7 +37,7 @@ class SfaApi (XmlrpcApi): """ def __init__ (self, encoding="utf-8", methods='sfa.methods', - config = "/etc/sfa/sfa_config.py", + config = "/etc/sfa/sfa_config", peer_cert = None, interface = None, key_file = None, cert_file = None, cache = None): @@ -161,7 +161,7 @@ class SfaApi (XmlrpcApi): auth_hrn = hrn auth_info = self.auth.get_auth_info(auth_hrn) from sfa.storage.alchemy import dbsession - from sfa.storage.persistentobjs import RegRecord + from sfa.storage.model import RegRecord record = dbsession.query(RegRecord).filter_by(type='authority+sa', hrn=hrn).first() if not record: raise RecordNotFound(hrn) @@ -212,7 +212,6 @@ class SfaApi (XmlrpcApi): code = { 'geni_code': GENICODE.SUCCESS, 'am_type': 'sfa', - 'am_code': None, } if isinstance(result, SfaFault): code['geni_code'] = result.faultCode