X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRemove.py;h=ee650f1ce67ead6d4c4db3c06223065355bef3a0;hb=cf630d87d633f3861e3ac8a50433fa29ca46a74e;hp=f13c95df5afc24185c095f5d47dccc7dbf8914a2;hpb=99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2;p=sfa.git

diff --git a/sfa/methods/Remove.py b/sfa/methods/Remove.py
index f13c95df..ee650f1c 100644
--- a/sfa/methods/Remove.py
+++ b/sfa/methods/Remove.py
@@ -1,12 +1,10 @@
-### $Id: remove.py 16497 2010-01-07 03:33:24Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/remove.py $
-
-from sfa.util.faults import *
-from sfa.util.namespace import urn_to_hrn
+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,
@@ -32,20 +30,15 @@ class Remove(Method):
     returns = Parameter(int, "1 if successful")
     
     def call(self, xrn, creds, type):
-        if not type:
-            hrn = urn_to_hrn(xrn)[0]
-        else: 
-            hrn, type = urn_to_hrn(xrn)
+        xrn=Xrn(xrn,type=type)
         
         # validate the cred
         valid_creds = self.api.auth.checkCredentials(creds, "remove")
-        self.api.auth.verify_object_permission(hrn)
+        self.api.auth.verify_object_permission(xrn.get_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()
+        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()))
 
-        return manager.remove(self.api, xrn, type) 
+        return self.api.manager.Remove(self.api, xrn)