From 4467ae7b4628475716d8f5426b0205cdcd32091d Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sun, 16 Oct 2011 23:24:09 -0400 Subject: [PATCH] ProtoGENI expects cred argument to be a list that contains only 1 cred --- sfa/client/sfi.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 056e09de..b7b8e6f6 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -987,10 +987,10 @@ class Sfi: slice_urn = hrn_to_urn(slice_hrn, 'slice') user_cred = self.get_user_cred() slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True) - creds = [slice_cred] - # always include a credential thats delegated to the callers root authority + # delegate the cred to the callers root authority delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)+'.slicemanager') - creds.append(delegated_cred) + #delegated_cred = self.delegate_cred(slice_cred, get_authority(slice_hrn)) + #creds.append(delegated_cred) rspec_file = self.get_rspec_file(args[1]) rspec = open(rspec_file).read() @@ -1012,8 +1012,10 @@ class Sfi: rspec = RSpec(rspec) rspec.filter({'component_manager_id': server_version['urn']}) rspec = RSpecConverter.to_pg_rspec(rspec.toxml(), content_type='request') + creds = [slice_cred] else: users = sfa_users_arg(user_records, slice_record) + creds = [slice_cred, delegated_cred] call_args = [slice_urn, creds, rspec, users] if self.server_supports_call_id_arg(server): call_args.append(unique_call_id()) -- 2.47.0