fix merge problem
[sfa.git] / sfa / methods / DeleteSliver.py
index 741bbd7..58b8846 100644 (file)
@@ -1,4 +1,3 @@
-from sfa.util.faults import *
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
 from sfa.util.parameter import Parameter, Mixed
@@ -26,14 +25,13 @@ class DeleteSliver(Method):
     returns = Parameter(int, "1 if successful")
     
     def call(self, xrn, creds, call_id=""):
-        hrn, type = urn_to_hrn(xrn)
+        (hrn, type) = urn_to_hrn(xrn)
         valid_creds = self.api.auth.checkCredentials(creds, 'deletesliver', hrn)
 
         #log the call
         origin_hrn = Credential(string=valid_creds[0]).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))
 
-        manager = self.api.get_interface_manager() 
-        manager.DeleteSliver(self.api, xrn, creds, call_id)
+        self.api.manager.DeleteSliver(self.api, xrn, creds, call_id)
  
         return 1