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
move body of sfaadmin in sfa/client
[sfa.git]
/
sfa
/
methods
/
Stop.py
diff --git
a/sfa/methods/Stop.py
b/sfa/methods/Stop.py
index
61c9285
..
0d80282
100644
(file)
--- a/
sfa/methods/Stop.py
+++ b/
sfa/methods/Stop.py
@@
-1,13
+1,10
@@
-### $Id: stop_slice.py 17732 2010-04-19 21:10:45Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/stop_slice.py $
-
-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, Mixed
-from sfa.trust.auth import Auth
+
from sfa.trust.credential import Credential
from sfa.trust.credential import Credential
+from sfa.storage.parameter import Parameter, Mixed
+
class Stop(Method):
"""
Stop the specified slice
class Stop(Method):
"""
Stop the specified slice
@@
-29,13
+26,12
@@
class Stop(Method):
def call(self, xrn, creds):
hrn, type = urn_to_hrn(xrn)
def call(self, xrn, creds):
hrn, type = urn_to_hrn(xrn)
- valid_creds = self.api.auth.checkCredentials(creds, '
deletesliver
', hrn)
+ valid_creds = self.api.auth.checkCredentials(creds, '
stopslice
', hrn)
#log the call
origin_hrn = Credential(string=valid_creds[0]).get_gid_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))
#log the call
origin_hrn = Credential(string=valid_creds[0]).get_gid_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))
- manager = self.api.get_interface_manager()
- manager.stop_slice(self.api, xrn, valid_creds)
+ self.api.manager.stop_slice(self.api, xrn, creds)
return 1
return 1