git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ca64f7
)
get origin hrn from the credentials gid_origin_caller object
author
Tony Mack
<tmack@cs.princeton.edu>
Wed, 30 Dec 2009 23:41:27 +0000
(23:41 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Wed, 30 Dec 2009 23:41:27 +0000
(23:41 +0000)
sfa/methods/create_slice.py
patch
|
blob
|
history
diff --git
a/sfa/methods/create_slice.py
b/sfa/methods/create_slice.py
index
e372afe
..
3e07f14
100644
(file)
--- a/
sfa/methods/create_slice.py
+++ b/
sfa/methods/create_slice.py
@@
-36,19
+36,20
@@
class create_slice(Method):
returns = Parameter(int, "1 if successful")
returns = Parameter(int, "1 if successful")
- def call(self, cred, hrn, requested_rspec, request_hash=None, origin_hrn=None):
- if origin_hrn==None:
- origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
+ def call(self, cred, hrn, requested_rspec, request_hash=None):
# This cred will be an slice cred, not a user, so we cant use it to
# authenticate the caller's request_hash. Let just get the caller's gid
# from the cred and authenticate using that
# This cred will be an slice cred, not a user, so we cant use it to
# authenticate the caller's request_hash. Let just get the caller's gid
# from the cred and authenticate using that
- client_gid = Credential(string=cred).get_gid_caller()
+ user_cred = Credential(string=cred)
+ client_gid = user_cred.get_gid_caller()
client_gid_str = client_gid.save_to_string(save_parents=True)
self.api.auth.authenticateGid(client_gid_str, [cred, hrn, requested_rspec], request_hash)
self.api.auth.check(cred, 'createslice')
#log the call
client_gid_str = client_gid.save_to_string(save_parents=True)
self.api.auth.authenticateGid(client_gid_str, [cred, hrn, requested_rspec], request_hash)
self.api.auth.check(cred, 'createslice')
#log the call
+ gid_origin_caller = user_cred.get_gid_origin_caller()
+ origin_hrn = gid_origin_caller.get_hrn()
self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
sfa_aggregate_type = Config().get_aggregate_rspec_type()
self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
sfa_aggregate_type = Config().get_aggregate_rspec_type()
@@
-85,6
+86,6
@@
class create_slice(Method):
mgr_type = self.api.config.SFA_SM_TYPE
manager_module = manager_base + ".slice_manager_%s" % mgr_type
manager = __import__(manager_module, fromlist=[manager_base])
mgr_type = self.api.config.SFA_SM_TYPE
manager_module = manager_base + ".slice_manager_%s" % mgr_type
manager = __import__(manager_module, fromlist=[manager_base])
- manager.create_slice(self.api, hrn, rspec,
origin_hrn
)
+ manager.create_slice(self.api, hrn, rspec,
gid_origin_caller
)
return 1
return 1