added support for urn name format. urn is the default name format used over the wire

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

diff --git a/sfa/methods/delete_slice.py b/sfa/methods/delete_slice.py
index 418d817..78baafa 100644 (file)
--- a/sfa/methods/delete_slice.py
+++ b/sfa/methods/delete_slice.py
@@ -2,40 +2,60 @@
 ### $URL$
 
 from sfa.util.faults import *
 ### $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
 from sfa.trust.credential import Credential
 
 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.plc.slices import Slices
-

 class delete_slice(Method):
     """
     Remove the slice from all nodes.      
 
     @param cred credential string specifying the rights of the caller
 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  
     """
 
     @return 1 if successful, faults otherwise  
     """
 

-    interfaces = ['aggregate', 'slicemgr']
+    interfaces = ['aggregate', 'slicemgr', 'component']

     
     accepts = [
         Parameter(str, "Credential string"),
     
     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"),
+              Parameter(None, "Origin hrn not specified"))

         ]
 
     returns = Parameter(int, "1 if successful")
     
         ]
 
     returns = Parameter(int, "1 if successful")
     

-    def call(self, cred, hrn, 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))
+    def call(self, cred, xrn, origin_hrn=None):
+        hrn, type = urn_to_hrn(xrn)
+        user_cred = Credential(string=cred)
+        
+        #log the call
+        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))

 
 

+        # validate the credential

         self.api.auth.check(cred, 'deleteslice')
         self.api.auth.check(cred, 'deleteslice')

-        slices = Slices(self.api, caller_cred=caller_cred)
-        slices.delete_slice(hrn)
+
+        # 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, 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 = 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 = manager_base + ".slice_manager_%s" % mgr_type
+            manager = __import__(manager_module, fromlist=[manager_base])
+            manager.delete_slice(self.api, xrn, origin_hrn)
+

         return 1
         return 1