root portal -> implements removal in portal csv #31

UAL-RE · Jul 21, 2020 · e4a2be0 · e4a2be0
1 parent fd446c7
commit e4a2be0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/requiam/manual_override.py b/requiam/manual_override.py
@@ -97,8 +97,12 @@ def update_dataframe(self, netid, uaid, group, group_type):
             print(f"Adding entry for {netid}")
             revised_df.loc[len(revised_df)] = [netid, list(uaid)[0], group]
         else:
-            print(f"Updating entry for {netid}")
-            revised_df.loc[loc0[0]] = [netid, list(uaid)[0], group]
+            if group != 'root':
+                print(f"Updating entry for {netid}")
+                revised_df.loc[loc0[0]] = [netid, list(uaid)[0], group]
+            else:
+                print(f"Removing entry for {netid}")
+                revised_df = revised_df.drop(loc0)
 
         print(f"Update {group_type} csv")
         if group_type == 'portal':

diff --git a/requiam/user_update b/requiam/user_update
@@ -164,6 +164,9 @@ if __name__ == '__main__':
                 mo.update_dataframe(vargs['netid'], user_uaid, vargs['portal'], 'portal')
             else:
                 log.info('dry run, not performing synchronization')
+        else:
+            # Remove entry from manual CSV file for 'root' case
+            mo.update_dataframe(vargs['netid'], user_uaid, vargs['portal'], 'portal')
 
     # Quota update
     if vargs['quota'] != '(unset)':