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.util.slices import Slices
+from sfa.plc.slices import Slices
class delete_slice(Method):
"""
accepts = [
Parameter(str, "Credential string"),
Parameter(str, "Human readable name of slice to delete"),
+ Mixed(Parameter(str, "Request hash"),
+ Parameter(None, "Request hash not specified"))
]
- returns = [Parameter(int, "1 if successful")]
+ returns = Parameter(int, "1 if successful")
- def call(self, cred, hrn):
+ def call(self, cred, hrn, request_hash=None, caller_cred=None):
+ 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(), hrn, self.name))
+
+ # 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()
+ client_gid_str = client_gid.save_to_string(save_parents=True)
+ self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash)
self.api.auth.check(cred, 'deleteslice')
- slices = Slices(self.api)
+ slices = Slices(self.api, caller_cred=caller_cred)
slices.delete_slice(hrn)
return 1