X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRemove.py;h=ee650f1ce67ead6d4c4db3c06223065355bef3a0;hb=99b7f92d2fb9ba847a51c235da6cf4705b216f4d;hp=73fcdf85787eb488ce98ee66214f17adbd2bf794;hpb=06b330f0ee047bdb107e43e82b1d7356c876bc15;p=sfa.git

diff --git a/sfa/methods/Remove.py b/sfa/methods/Remove.py
index 73fcdf85..ee650f1c 100644
--- a/sfa/methods/Remove.py
+++ b/sfa/methods/Remove.py
@@ -1,9 +1,10 @@
-from sfa.util.faults import *
 from sfa.util.xrn import Xrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+
 from sfa.trust.credential import Credential
 
+from sfa.storage.parameter import Parameter, Mixed
+
 class Remove(Method):
     """
     Remove an object from the registry. If the object represents a PLC object,
@@ -29,7 +30,7 @@ class Remove(Method):
     returns = Parameter(int, "1 if successful")
     
     def call(self, xrn, creds, type):
-        xrn=Xrn(xrn=xrn,type=type)
+        xrn=Xrn(xrn,type=type)
         
         # validate the cred
         valid_creds = self.api.auth.checkCredentials(creds, "remove")
@@ -40,6 +41,4 @@ class Remove(Method):
         self.api.logger.info("interface: %s\tmethod-name: %s\tcaller-hrn: %s\ttarget-urn: %s"%(
                 self.api.interface, self.name, origin_hrn, xrn.get_urn()))
 
-        manager = self.api.get_interface_manager()
-
-        return manager.remove(self.api, xrn) 
+        return self.api.manager.Remove(self.api, xrn)