From: Tony Mack <tmack@cs.princeton.edu>
Date: Fri, 23 Oct 2009 02:36:25 +0000 (+0000)
Subject: get_user_cred(), get_auth_cred() and get_slice_cred() all return objects...for now... 
X-Git-Tag: sfa-0.9-6~146
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3e4e1d382c5194fd14839f5213e382164042b273;p=sfa.git

get_user_cred(), get_auth_cred() and get_slice_cred() all return objects...for now. will change this to strings later
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 8721f115..27fa0378 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -210,9 +210,12 @@ class Sfi:
           return slice_cred
        else:
           # bootstrap slice credential from user credential
-          user_cred = self.get_user_cred()
-          slice_cred = self.registry.get_credential(user_cred, "slice", name)
+          user_cred = self.get_user_cred().save_to_string(save_parents=True)
+          arg_list = [user_cred, "slice", name]
+          request_hash = self.key.compute_hash(arg_list)  
+          slice_cred_str = self.registry.get_credential(user_cred, "slice", name, request_hash)
           if slice_cred:
+             slice_cred = Credential(string=slice_cred_str)
              slice_cred.save_to_file(file, save_parents=True)
              if self.options.verbose:
                 print "Writing slice credential to", file