add request_hash argument to more method calls
authorTony Mack <tmack@cs.princeton.edu>
Fri, 16 Oct 2009 03:31:22 +0000 (03:31 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Fri, 16 Oct 2009 03:31:22 +0000 (03:31 +0000)
sfa/client/sfi.py
sfa/methods/get_slices.py

index d604978..3188e9a 100755 (executable)
@@ -589,10 +589,12 @@ class Sfi:
 
     # list instantiated slices
     def slices(self,opts, args):
-       user_cred = self.get_user_cred()
-       results = self.slicemgr.get_slices(user_cred)
-       self.display_list(results)
-       return
+        user_cred = self.get_user_cred().save_to_string(save_parents=True)
+        arg_list = [user_cred]
+        request_hash = self.key.compute_hash(arg_list)
+        results = self.slicemgr.get_slices(user_cred, request_hash)
+        self.display_list(results)
+        return
     
     # show rspec for named slice
     def resources(self,opts, args):
index 603f643..7fea274 100644 (file)
@@ -20,12 +20,13 @@ class get_slices(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
+        Parameter(str, "Request hash")
         ]
 
     returns = [Parameter(str, "Human readable slice name (hrn)")]
     
-    def call(self, cred):
-       
+    def call(self, cred, request_hash):
+        self.api.auth.authenticateCred(cred, [cred], request_hash) 
         self.api.auth.check(cred, 'listslices')
         slices = Slices(self.api)
         slices.refresh()