git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Xrn object is initialized with a single non-optional xrn string. hrn/urn is detecte...
[sfa.git]
/
sfa
/
methods
/
Remove.py
diff --git
a/sfa/methods/Remove.py
b/sfa/methods/Remove.py
index
d991159
..
73437a3
100644
(file)
--- 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.faults import *
-from sfa.util.
namespace 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.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):
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")
# 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()
#log the call
origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
- self.api.logger.info("interface: %s\t
caller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
-
+ self.api.logger.info("interface: %s\t
method-name: %s\tcaller-hrn: %s\ttarget-urn: %s"%(
+ self.api.interface, self.name, origin_hrn, xrn.get_urn()))
manager = self.api.get_interface_manager()
manager = self.api.get_interface_manager()
- return manager.remove(self.api, xrn
, type
)
+ return manager.remove(self.api, xrn)