returns = Parameter(int, "1 if successful")
- def call(self, cred, hrn, request_hash=None, caller_cred=None):
+ def call(self, cred, hrn, request_hash=None, origin_hrn=None):
- if caller_cred==None:
- caller_cred=cred
+ if origin_hrn==None:
+ origin_hrn=origin_hrn=Credential(string=cred).get_gid_caller().get_hrn()
#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))
+ self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_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
manager_base = 'sfa.managers'
if self.api.interface in ['component']:
mgr_type = self.api.config.SFA_CM_TYPE
- manager_module = manger_base+= ".component_manager_%s" % mgr_type
- manager = __import__(manager_module, manager_base)
+ manager_module = manager_base + ".component_manager_%s" % mgr_type
+ manager = __import__(manager_module, fromlist=[manager_base])
manager.delete_slice(self.api, hrn)
elif self.api.interface in ['aggregate']:
mgr_type = self.api.config.SFA_AGGREGATE_TYPE
- manager_module = manger_base+= ".agregate_manager_%s" % mgr_type
- manager = __import__(manager_module, manager_base)
+ manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
+ manager = __import__(manager_module, fromlist=[manager_base])
manager.delete_slice(self.api, hrn)
- elif self.api.interface in ['slicemngr']:
+ elif self.api.interface in ['slicemgr']:
mgr_type = self.api.config.SFA_SM_TYPE
- manager_module = manger_base+= ".slice_manager_%s" % mgr_type
- manager = __import__(manager_module, manager_base)
- manager.delete_slice(self.api, hrn, caller_cred)
+ manager_module = manager_base + ".slice_manager_%s" % mgr_type
+ manager = __import__(manager_module, fromlist=[manager_base])
+ manager.delete_slice(self.api, hrn, origin_hrn)
return 1