X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;fp=sfa%2Fclient%2Fsfi.py;h=13653420f27e6aebfbfd7bddfb05780715732f69;hp=e3f65c9fd377509cf222a7bf0f38177672f227a9;hb=99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2;hpb=b5274259ddb8f0582b42ad760ed01280c2c2e407 diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index e3f65c9f..13653420 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -18,6 +18,7 @@ import zlib from sfa.util.sfalogging import sfa_logger,sfa_logger_goes_to_console from sfa.trust.certificate import Keypair, Certificate +from sfa.trust.gid import GID from sfa.trust.credential import Credential from sfa.util.sfaticket import SfaTicket from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord @@ -26,7 +27,6 @@ from sfa.util.xmlrpcprotocol import ServerException import sfa.util.xmlrpcprotocol as xmlrpcprotocol from sfa.util.config import Config - AGGREGATE_PORT=12346 CM_PORT=12346 @@ -400,8 +400,8 @@ class Sfi: if (os.path.isfile(file)): credential = Credential(filename=file) # make sure it isnt expired - if not credential.get_lifetime or \ - datetime.datetime.today() < credential.get_lifetime(): + if not credential.get_expiration or \ + datetime.datetime.today() < credential.get_expiration(): return credential return None