script_run: Add members only via set.union hack for --org_codes or --…

…groups #65
UAL-RE · Oct 6, 2020 · 2649160 · 2649160
1 parent dcb0a94
commit 2649160
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/scripts/script_run b/scripts/script_run
@@ -293,6 +293,7 @@ if __name__ == '__main__':
                 ldap_queries = ldap_query.ual_ldap_queries(org_code_list)
 
                 ldap_members = ldap_query.ldap_search(ldc, ldap_queries)
+                log.info(f"EDS before {len(ldap_members)}")
 
                 # Update based on CSV manual input files
                 if mo_status:
@@ -307,6 +308,12 @@ if __name__ == '__main__':
                                   log=log)
                 log.info(" Grouper size {}".format(len(gq.members)))
 
+                # For --org_codes or --groups, only add users
+                if not isinstance(org_codes, type(None)):
+                    log.info("Special mode with --org_codes --groups. Adding users only")
+                    # Combine grouper members with new ldap members
+                    ldap_members = set.union(gq.members, ldap_members)
+
                 d = delta.Delta(ldap_members=ldap_members,
                                 grouper_query_instance=gq,
                                 **delta_dict,
@@ -350,6 +357,7 @@ if __name__ == '__main__':
             # LDAP query to retrieve members
             ldap_queries = quota.ual_ldap_quota_query(c, org_codes=org_codes)
             ldap_members = ldap_query.ldap_search(ldc, ldap_queries)
+            log.info(f"EDS before {len(ldap_members)}")
 
             # Update based on CSV manual input files
             if mo_status:
@@ -362,6 +370,12 @@ if __name__ == '__main__':
             gq = GrouperQuery(**grouper_dict, grouper_group=grouper_quota, log=log)
             log.info(" Grouper size {}".format(len(gq.members)))
 
+            # For --org_codes or --groups, only add users
+            if not isinstance(org_codes, type(None)):
+                log.info("Special mode with --org_codes --groups. Adding users only")
+                # Combine grouper members with new ldap members
+                ldap_members = set.union(gq.members, ldap_members)
+
             # Delta between LDAP and Grouper
             d = delta.Delta(ldap_members=ldap_members,
                             grouper_query_instance=gq,