bug fix in binding person to a site

[sfa.git] / sfa / plc / slices.py

diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py
index 8931296..7a6b514 100644 (file)
--- a/sfa/plc/slices.py
+++ b/sfa/plc/slices.py
@@ -184,12 +184,12 @@ class Slices(SimpleStorage):
 
         # Make sure slice exists at plc, if it doesnt add it
         slicename = hrn_to_pl_slicename(hrn)
-        slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['slice_id', 'node_ids'])
+        slices = self.api.plshell.GetSlices(self.api.plauth, [slicename], ['slice_id', 'node_ids', 'site_id'] )
+        parts = slicename.split("_")
+        login_base = parts[0]
+        # if site doesnt exist add it
+        sites = self.api.plshell.GetSites(self.api.plauth, [login_base])
         if not slices:
-            parts = slicename.split("_")
-            login_base = parts[0]
-            # if site doesnt exist add it
-            sites = self.api.plshell.GetSites(self.api.plauth, [login_base])
             if not sites:
                 authority = get_authority(hrn)
                 site_records = registry.resolve(credential, authority)
@@ -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 = {}
@@ -225,7 +227,9 @@ class Slices(SimpleStorage):
             slice['node_ids'] = []
         else:
             slice = slices[0]
-            slice_id = slice['slice_id']    
+            slice_id = slice['slice_id']
+            site_id = slice['site_id']    
+            remote_site_id = sites[0]['peer_site_id']
         # get the list of valid slice users from the registry and make 
         # they are added to the slice 
         researchers = record.get('researcher', [])
@@ -263,9 +267,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'])