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
Merge branch 'thgeneric' of ssh://git.onelab.eu/git/sfa into thgeneric
[sfa.git]
/
sfa
/
methods
/
SliverStatus.py
diff --git
a/sfa/methods/SliverStatus.py
b/sfa/methods/SliverStatus.py
index
a23acb6
..
2f4bc0c
100644
(file)
--- a/
sfa/methods/SliverStatus.py
+++ b/
sfa/methods/SliverStatus.py
@@
-1,7
+1,6
@@
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
from sfa.util.method import Method
from sfa.util.method import Method
-from sfa.util.parameter import Parameter
+from sfa.util.parameter import Parameter
, Mixed
class SliverStatus(Method):
"""
class SliverStatus(Method):
"""
@@
-15,17
+14,17
@@
class SliverStatus(Method):
Parameter(str, "Slice URN"),
Mixed(Parameter(str, "Credential string"),
Parameter(type([str]), "List of credentials")),
Parameter(str, "Slice URN"),
Mixed(Parameter(str, "Credential string"),
Parameter(type([str]), "List of credentials")),
+ Parameter(str, "call_id"),
]
returns = Parameter(dict, "Status details")
]
returns = Parameter(dict, "Status details")
- def call(self, slice_xrn, creds):
+ def call(self, slice_xrn, creds
, call_id=""
):
hrn, type = urn_to_hrn(slice_xrn)
valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
hrn, type = urn_to_hrn(slice_xrn)
valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
- manager = self.api.get_interface_manager()
- status = manager.slice_status(self.api, xrn, valid_creds)
+ status = self.api.manager.SliverStatus(self.api, hrn, valid_creds, call_id)
return status
return status