shape the sfa.trust subpackage

[sfa.git] / geni / util / geniclient.py

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index fb969f7..6fbd206 100644 (file)
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -6,12 +6,15 @@
 # TODO: Investigate ways to combine this with existing PLC API?
 ##
 
+### $Id$
+### $URL$
+
 import xmlrpclib
 
-from gid import *
-from credential import *
-from record import *
-from geniticket import *
+from geni.trust.gid import *
+from geni.trust.credential import *
+from geni.util.record import *
+from geni.util.geniticket import *
 
 ##
 # ServerException, ExceptionUnmarshaller
@@ -313,8 +316,8 @@ class GeniClient():
     # @param cred a credential identifying the caller (callerGID) and the slice
     #     (objectGID)
 
-    def reset_slice(self, cred):
-        result = self.server.reset_slice(cred.save_to_string(save_parents=True))
+    def reset_slice(self, cred, hrn):
+        result = self.server.reset_slice(cred.save_to_string(save_parents=True), hrn)
         return result
 
     ##