git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow us to specify which columns to return
[sfa.git]
/
sfa
/
methods
/
get_slices.py
diff --git
a/sfa/methods/get_slices.py
b/sfa/methods/get_slices.py
index
d3976e8
..
b50d7e3
100644
(file)
--- a/
sfa/methods/get_slices.py
+++ b/
sfa/methods/get_slices.py
@@
-6,7
+6,8
@@
from sfa.util.misc import *
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
-from sfa.util.slices import Slices
+from sfa.plc.slices import Slices
+from sfa.trust.credential import Credential
class get_slices(Method):
"""
class get_slices(Method):
"""
@@
-20,13
+21,21
@@
class get_slices(Method):
accepts = [
Parameter(str, "Credential string"),
accepts = [
Parameter(str, "Credential string"),
+ Mixed(Parameter(str, "Request hash"),
+ Parameter(None, "Request hash not specified")),
+ Parameter(str, "Callers credential string")
]
returns = [Parameter(str, "Human readable slice name (hrn)")]
]
returns = [Parameter(str, "Human readable slice name (hrn)")]
- def call(self, cred):
-
+ def call(self, cred
, request_hash=None, caller_cred=None
):
+ self.api.auth.authenticateCred(cred, [cred], request_hash)
self.api.auth.check(cred, 'listslices')
self.api.auth.check(cred, 'listslices')
- slices = Slices(self.api)
- slices.refresh()
+ if caller_cred==None:
+ caller_cred=cred
+
+ #log the call
+ self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), None, self.name))
+ slices = Slices(self.api, caller_cred=caller_cred)
+ slices.refresh()
return slices['hrn']
return slices['hrn']