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
using method get_self_credential to bootstrap SM credential
[sfa.git]
/
sfa
/
methods
/
remove_peer_object.py
diff --git
a/sfa/methods/remove_peer_object.py
b/sfa/methods/remove_peer_object.py
index
67fa56a
..
51fb658
100644
(file)
--- a/
sfa/methods/remove_peer_object.py
+++ b/
sfa/methods/remove_peer_object.py
@@
-26,17
+26,19
@@
class remove_peer_object(Method):
accepts = [
Parameter(str, "Credential string"),
accepts = [
Parameter(str, "Credential string"),
- Parameter(dict, "Record dictionary")
+ Parameter(dict, "Record dictionary"),
+ Mixed(Parameter(str, "Request hash"),
+ Parameter(None, "Request hash not specified"))
]
returns = Parameter(int, "1 if successful")
]
returns = Parameter(int, "1 if successful")
- def call(self, cred, record, caller_cred=None):
+ def call(self, cred, record,
request_hash=None,
caller_cred=None):
if caller_cred==None:
caller_cred=cred
#log the call
if caller_cred==None:
caller_cred=cred
#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))
-
+ 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(),
record['hrn']
, self.name))
+ self.api.auth.authenticateCred(cred, [cred], request_hash)
self.api.auth.check(cred, "remove")
# Only allow the local interface or record owner to delete peer_records
self.api.auth.check(cred, "remove")
# Only allow the local interface or record owner to delete peer_records
@@
-44,9
+46,10
@@
class remove_peer_object(Method):
except: self.api.auth.verify_cred_is_me(cred)
table = GeniTable()
except: self.api.auth.verify_cred_is_me(cred)
table = GeniTable()
- hrn, type
, peer_auth
= record['hrn'], record['type']
+ hrn, type = record['hrn'], record['type']
records = table.find({'hrn': hrn, 'type': type })
for record in records:
records = table.find({'hrn': hrn, 'type': type })
for record in records:
+ if record['peer_authority']:
self.remove_plc_record(record)
table.remove(record)
self.remove_plc_record(record)
table.remove(record)
@@
-66,12
+69,12
@@
class remove_peer_object(Method):
elif type == "slice":
slices=self.api.plshell.GetSlices(self.api.plauth, {'slice_id' : record['pointer']})
elif type == "slice":
slices=self.api.plshell.GetSlices(self.api.plauth, {'slice_id' : record['pointer']})
-
if not slices:
+ if not slices:
return 1
return 1
-
slice=slices[0]
+ slice=slices[0]
if slice['peer_id']:
peer = self.get_peer_name(slice['peer_id'])
if slice['peer_id']:
peer = self.get_peer_name(slice['peer_id'])
-
self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', slice['slice_id'], peer)
+ self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'slice', slice['slice_id'], peer)
self.api.plshell.DeleteSlice(self.api.plauth, slice['slice_id'])
elif type == "authority":
sites=self.api.plshell.GetSites(self.api.plauth, {'site_id' : record['pointer']})
self.api.plshell.DeleteSlice(self.api.plauth, slice['slice_id'])
elif type == "authority":
sites=self.api.plshell.GetSites(self.api.plauth, {'site_id' : record['pointer']})
@@
-93,7
+96,7
@@
class remove_peer_object(Method):
if not peers:
raise GeniInvalidArgument, "No such peer"
peer = peers[0]
if not peers:
raise GeniInvalidArgument, "No such peer"
peer = peers[0]
- return peer['
peer
name']
+ return peer['
short
name']