From: Tony Mack Date: Tue, 18 Aug 2009 17:43:27 +0000 (+0000) Subject: add peer person to peer site X-Git-Tag: sfa-0.9-1~70 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d023266dbd4eea4e1546166e2a9b67a9d61a8489;p=sfa.git add peer person to peer site --- diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py index 89312961..28c39fdc 100644 --- a/sfa/plc/slices.py +++ b/sfa/plc/slices.py @@ -207,6 +207,8 @@ class Slices(SimpleStorage): self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id) else: site = sites[0] + site_id = site['site_id'] + remote_site_id = site['peer_site_id'] # create slice object slice_fields = {} @@ -263,9 +265,13 @@ class Slices(SimpleStorage): # an error if peer: self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'person', person_id, peer) - self.api.plshell.AddPersonToSlice(self.api.plauth, person_dict['email'], slicename) + self.api.plshell.UnBindObjectFromPeer(self.api.plauth, 'site', site_id, peer) + + self.api.plshell.AddPersonToSlice(self.api.plauth, person_dict['email'], slicename) + self.api.plshell.AddPersonToSite(self.api.plauth, person_dict['email'], site_id) if peer: - self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer']) + self.api.plshell.BindObjectToPeer(self.api.plauth, 'person', person_id, peer, person_record['pointer']) + self.api.plshell.BindObjectToPeer(self.api.plauth, 'site', site_id, peer, remote_site_id) # Get this users local keys keylist = self.api.plshell.GetKeys(self.api.plauth, key_ids, ['key'])