From: Tony Mack Date: Mon, 27 Sep 2010 19:17:43 +0000 (-0400) Subject: get_gid_caller() belongs to Credential object X-Git-Tag: sfa-1.0-2~14^2~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ff6db6c1a9e815d694d68619e94df04c2d0fd463;hp=86558315779a33930c809a4d0b55b8adc57434b5;p=sfa.git get_gid_caller() belongs to Credential object --- diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index 4f1d5497..53a73b5d 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -62,7 +62,7 @@ def create_slice(api, xrn, creds, rspec, users): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'createsliver', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) @@ -86,7 +86,7 @@ def create_slice(api, xrn, creds, rspec, users): def renew_slice(api, xrn, creds, expiration_time): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'renewesliver', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) @@ -116,7 +116,7 @@ def get_ticket(api, xrn, creds, rspec, users): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'getticket', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) @@ -185,7 +185,7 @@ def get_ticket(api, xrn, creds, rspec, users): def delete_slice(api, xrn, creds): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'deletesliver', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) @@ -205,7 +205,7 @@ def delete_slice(api, xrn, creds): def start_slice(api, xrn, creds): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'startslice', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) @@ -225,7 +225,7 @@ def start_slice(api, xrn, creds): def stop_slice(api, xrn, creds): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'stopslice', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) @@ -270,7 +270,7 @@ def get_slices(api, creds): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'listslices', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds) @@ -320,7 +320,7 @@ def get_rspec(api, creds, options): # get the callers hrn valid_cred = api.auth.checkCredentials(creds, 'listnodes', hrn)[0] - caller_hrn = valid_cred.get_gid_caller().get_hrn() + caller_hrn = Credential(string=valid_cred).get_gid_caller().get_hrn() # attempt to use delegated credential first credential = api.getDelegatedCredential(creds)