from sfa.trust.certificate import Certificate
from sfa.trust.credential import Credential
-from sfa.trust.gid import create_uuid
-from sfa.util.geniclient import GeniClient, ServerException
+from sfa.util.geniclient import GeniClient
from sfa.util.record import GeniRecord
-from sfa.util.rspec import Rspec
+from sfa.util.rspec import RSpec
-def determine_geni_filekind(fn):
+def determine_sfa_filekind(fn):
cert = Certificate(filename = fn)
data = cert.get_data()
return -1
filename = args[0]
- kind = determine_geni_filekind(filename)
+ kind = determine_sfa_filekind(filename)
if kind=="credential":
cred = Credential(filename = filename)