### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/reset_slices.py $
from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
Reset the specified slice
@param cred credential string specifying the rights of the caller
- @param hrn human readable name of slice to instantiate
+ @param xrn human readable name of slice to instantiate (hrn or urn)
@return 1 is successful, faults otherwise
"""
accepts = [
Parameter(str, "Credential string"),
- Parameter(str, "Human readable name of slice to instantiate"),
- Mixed(Parameter(str, "Request hash"),
- Parameter(None, "Request hash not specified"))
+ Parameter(str, "Human readable name of slice to instantiate (hrn or urn)"),
+ Mixed(Parameter(str, "Human readable name of the original caller"),
+ Parameter(None, "Origin hrn not specified"))
]
returns = Parameter(int, "1 if successful")
- def call(self, cred, hrn, request_hash=None):
- # This cred will be an authority 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()
- client_gid_str = client_gid.save_to_string(save_parents=True)
- self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash)
+ def call(self, cred, xrn, origin_hrn=None):
+ hrn, type = urn_to_hrn(xrn)
self.api.auth.check(cred, 'resetslice')
# send the call to the right manager
manager_base = 'sfa.managers'
if self.api.interface in ['component']:
mgr_type = self.api.config.SFA_CM_TYPE
manager_module = manager_base + ".component_manager_%s" % mgr_type
- manager = __import__(manager_module, manager_base)
- manager.reset_slice(self.api, hrn)
+ manager = __import__(manager_module, fromlist=[manager_base])
+ manager.reset_slice(self.api, xrn)
elif self.api.interface in ['aggregate']:
mgr_type = self.api.config.SFA_AGGREGATE_TYPE
- manager_module = manager_base + ".agregate_manager_%s" % mgr_type
- manager = __import__(manager_module, manager_base)
- manager.reset_slice(self.api, hrn)
+ manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
+ manager = __import__(manager_module, fromlist=[manager_base])
+ manager.reset_slice(self.api, xrn)
elif self.api.interface in ['slicemgr']:
mgr_type = self.api.config.SFA_SM_TYPE
manager_module = manager_base + ".slice_manager_%s" % mgr_type
- manager = __import__(manager_module, manager_base)
- manager.reset_slice(self.api, hrn)
+ manager = __import__(manager_module, fromlist=[manager_base])
+ manager.reset_slice(self.api, xrn)
return 1