X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fdelete_slice.py;h=78baafaca296a7b71e898e3af6ec974083caab3b;hb=11d02cbfd5e91784119bb9377fceb4fa6adae621;hp=4b1fb68098b92454e06750dd9c617395548c8cbb;hpb=283517b841aa5a5f695cd4d18eb119582e204c82;p=sfa.git

diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py
index 4b1fb680..78baafac 100644
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -2,7 +2,7 @@
 ### $URL$
 
 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
@@ -13,7 +13,7 @@ class delete_slice(Method):
     Remove the slice from all nodes.      
 
     @param cred credential string specifying the rights of the caller
-    @param hrn human readable name specifying the slice to delete
+    @param xrn human readable name specifying the slice to delete (hrn or urn)
     @return 1 if successful, faults otherwise  
     """
 
@@ -21,45 +21,41 @@ 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"))
+        Parameter(str, "Human readable name of slice to delete (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, caller_cred=None):
-       
-        if caller_cred==None:
-            caller_cred=cred
+    def call(self, cred, xrn, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn)
+        user_cred = Credential(string=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))
+        if not origin_hrn:
+            origin_hrn = user_cred.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))
 
-        # 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)
+        # validate the credential
         self.api.auth.check(cred, 'deleteslice')
 
-        
         # 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 = manger_base + ".component_manager_%s" % mgr_type
-            manager = __import__(manager_module, manager_base)
-            manager.delete_slice(self.api, hrn)
+            manager_module = manager_base + ".component_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            manager.delete_slice(self.api, xrn)
         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.delete_slice(self.api, hrn)
+            manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            manager.delete_slice(self.api, xrn)
         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, xrn, origin_hrn)
 
         return 1