check the specified hrn against the target hrn in the credential

[sfa.git] / sfa / methods / delete_slice.py

diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py
index 11b9124..3441998 100644 (file)
--- 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,14 +21,15 @@ class delete_slice(Method):
     
     accepts = [
         Parameter(str, "Credential string"),
-        Parameter(str, "Human readable name of slice to delete"),
+        Parameter(str, "Human readable name of slice to delete (hrn or urn)"),
         Mixed(Parameter(str, "Human readable name of the original caller"),
-              Paramater(None, "Origin hrn not specified"))
+              Parameter(None, "Origin hrn not specified"))
         ]
 
     returns = Parameter(int, "1 if successful")
     
-    def call(self, cred, hrn, origin_hrn=None):
+    def call(self, cred, xrn, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn)
         user_cred = Credential(string=cred)
         
         #log the call
@@ -37,7 +38,7 @@ class delete_slice(Method):
         self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
 
         # validate the credential
-        self.api.auth.check(cred, 'deleteslice')
+        self.api.auth.check(cred, 'deleteslice', hrn)
 
         # send the call to the right manager
         manager_base = 'sfa.managers'
@@ -45,16 +46,16 @@ class delete_slice(Method):
             mgr_type = self.api.config.SFA_CM_TYPE
             manager_module = manager_base + ".component_manager_%s" % mgr_type
             manager = __import__(manager_module, fromlist=[manager_base])
-            manager.delete_slice(self.api, hrn)
+            manager.delete_slice(self.api, xrn)
         elif self.api.interface in ['aggregate']:
             mgr_type = self.api.config.SFA_AGGREGATE_TYPE
             manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
             manager = __import__(manager_module, fromlist=[manager_base])
-            manager.delete_slice(self.api, hrn)
+            manager.delete_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, fromlist=[manager_base])
-            manager.delete_slice(self.api, hrn, origin_hrn)
+            manager.delete_slice(self.api, xrn, origin_hrn)
 
         return 1