X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fslices.py;h=582dd67cce5265bb3a64122ff9951cfe24b83de3;hb=c28103f191986facf0e47727d4d6fef338291b37;hp=bf91219c3b83c322ce83cf6db5f60e5efff372b8;hpb=70f2959fa524d59d366b52a3210d58e97a8e391d;p=sfa.git

diff --git a/sfa/plc/slices.py b/sfa/plc/slices.py
index bf91219c..582dd67c 100644
--- a/sfa/plc/slices.py
+++ b/sfa/plc/slices.py
@@ -346,17 +346,20 @@ class Slices:
 
         users_dict = {} 
         for user in users:
+            hrn, type = urn_to_hrn(user['urn'])
+            username = get_leaf(hrn)
+            login_base = get_leaf(get_authority(user['urn']))
+            user['username'] = username
+            user['site'] = login_base
+
             if 'append' in user and user['append'] == False:
                 append = False
+                
             if 'email' in user:
                 users_by_email[user['email']] = user
                 users_dict[user['email']] = user
-            elif 'urn' in user:
-                hrn, type = urn_to_hrn(user['urn'])
-                username = get_leaf(hrn) 
-                login_base = get_leaf(get_authority(user['urn']))
-                user['username'] = username 
-                users_by_site[login_base].append(user)
+            else:
+                users_by_site[user['site']].append(user)
 
         existing_user_ids = []
         if users_by_email:
@@ -447,7 +450,7 @@ class Slices:
             self.api.driver.UpdatePerson(person['person_id'], {'enabled': True})
             
             # add person to site
-            self.api.driver.AddPersonToSite(added_user_id, login_base)
+            self.api.driver.AddPersonToSite(added_user_id, added_user['site'])
 
             for key_string in added_user.get('keys', []):
                 key = {'key':key_string, 'key_type':'ssh'}