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
a lingering raise
[sfa.git]
/
sfa
/
methods
/
Remove.py
diff --git
a/sfa/methods/Remove.py
b/sfa/methods/Remove.py
index
73fcdf8
..
ee650f1
100644
(file)
--- 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.xrn import Xrn
from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+
from sfa.trust.credential import Credential
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,
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):
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")
# 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()))
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)