From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 16 Oct 2009 03:31:22 +0000 (+0000)
Subject: add request_hash argument to more method calls
X-Git-Tag: sfa-0.9-6~170
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=bb08c68eb53c55009be93fd91579a9685eb23860

add request_hash argument to more method calls
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index d604978a..3188e9ad 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -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):
diff --git a/sfa/methods/get_slices.py b/sfa/methods/get_slices.py
index 603f6431..7fea2745 100644
--- a/sfa/methods/get_slices.py
+++ b/sfa/methods/get_slices.py
@@ -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()