X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRemove.py;h=73437a3933cf6394490b326c5ec253f0c0ee7064;hb=db03eb2324ae3cc66232f7bedccf3f3f204349c7;hp=f13c95df5afc24185c095f5d47dccc7dbf8914a2;hpb=3109c266ca3a5df2364e52502479adcc2f995d68;p=sfa.git

diff --git a/sfa/methods/Remove.py b/sfa/methods/Remove.py
index f13c95df..73437a39 100644
--- a/sfa/methods/Remove.py
+++ b/sfa/methods/Remove.py
@@ -1,8 +1,5 @@
-### $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
@@ -32,20 +29,17 @@ 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))
-
+        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, type) 
+        return manager.remove(self.api, xrn)