shape the sfa.trust subpackage

[sfa.git] / geni / client / genidump.py

diff --git a/geni/client/genidump.py b/geni/client/genidump.py
index 99812cd..49365ed 100644 (file)
--- a/geni/client/genidump.py
+++ b/geni/client/genidump.py
@@ -8,15 +8,15 @@ import xmlrpclib
 from types import StringTypes, ListType
 from optparse import OptionParser
 
-from geni.util.certificate import Keypair, Certificate
-from geni.util.credential import Credential
+from geni.trust.certificate import Keypair, Certificate
+from geni.trust.credential import Credential
 from geni.util.geniclient import GeniClient, ServerException
-from geni.util.gid import create_uuid
+from geni.trust.gid import create_uuid
 from geni.util.record import GeniRecord
 from geni.util.rspec import Rspec
 
 def determine_geni_filekind(fn):
-    from geni.util.certificate import Certificate
+    from geni.trust.certificate import Certificate
 
     cert = Certificate(filename = fn)