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
the build was failing here due to IndentationError
[sfa.git]
/
sfa
/
methods
/
remove.py
diff --git
a/sfa/methods/remove.py
b/sfa/methods/remove.py
index
58d0706
..
8925002
100644
(file)
--- a/
sfa/methods/remove.py
+++ b/
sfa/methods/remove.py
@@
-28,19
+28,25
@@
class remove(Method):
accepts = [
Parameter(str, "Credential string"),
Parameter(str, "Record type"),
accepts = [
Parameter(str, "Credential string"),
Parameter(str, "Record type"),
- Parameter(str, "Human readable name (hrn) of record to be removed")
+ Parameter(str, "Human readable name of slice to instantiate"),
+ Mixed(Parameter(str, "Human readable name of the original caller"),
+ Parameter(None, "Origin hrn not specified"))
]
returns = Parameter(int, "1 if successful")
]
returns = Parameter(int, "1 if successful")
- def call(self, cred, type, hrn,
caller_cred
=None):
- if caller_cred==None:
- caller_cred=cred
+ def call(self, cred, type, hrn,
origin_hrn
=None):
+ user_cred = Credential(string=cred)
+
#log the call
#log the call
- self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, Credential(string=caller_cred).get_gid_caller().get_hrn(), hrn, self.name))
+ if not origin_hrn:
+ origin_hrn = user_cred.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))
+ # validate the cred
self.api.auth.check(cred, "remove")
self.api.auth.verify_object_permission(hrn)
self.api.auth.check(cred, "remove")
self.api.auth.verify_object_permission(hrn)
+
table = GeniTable()
filter = {'hrn': hrn}
if type not in ['all', '*']:
table = GeniTable()
filter = {'hrn': hrn}
if type not in ['all', '*']:
@@
-59,10
+65,8
@@
class remove(Method):
if hrn.startswith(self.api.hrn) and type in ['user', 'slice', 'authority']:
for registry in registries:
if registry not in [self.api.hrn]:
if hrn.startswith(self.api.hrn) and type in ['user', 'slice', 'authority']:
for registry in registries:
if registry not in [self.api.hrn]:
- try:
- result=registries[registry].remove_peer_object(credential, record)
- except:
- pass
+ result=registries[registry].remove_peer_object(credential, record, origin_hrn)
+ pass
if type == "user":
persons = self.api.plshell.GetPersons(self.api.plauth, record['pointer'])
# only delete this person if he has site ids. if he doesnt, it probably means
if type == "user":
persons = self.api.plshell.GetPersons(self.api.plauth, record['pointer'])
# only delete this person if he has site ids. if he doesnt, it probably means
@@
-83,6
+87,4
@@
class remove(Method):
table.remove(record)
table.remove(record)
- # forward the call after replacing the root hrn
-
return 1
return 1