Merge remote-tracking branch 'upstream/master' into itb

matyasselmeci · Apr 22, 2024 · 0e9625c · 0e9625c
2 parents a78089a + 30f73dc
commit 0e9625c
Show file tree

Hide file tree

Showing 1,201 changed files with 4,968 additions and 511 deletions.
diff --git a/Procfile b/Procfile
diff --git a/bin/osg-notify b/bin/osg-notify
@@ -22,6 +22,7 @@ if __name__ == "__main__" and __package__ is None:
     sys.path.append(_parent + "/src")
 
 import topology_utils
+from topology_utils import TopologyPoolManager
 import net_name_addr_utils
 
 # Parts of this implementation are from the following StackOverflow answer:
@@ -182,13 +183,13 @@ def has_non_printable_ascii_characters(contents):
 
 def main():
     args = parseargs()
-
+    pm = TopologyPoolManager()
     recipients = set(args.recipients.split())
     if args.oim_recipients and 'vos' in args.oim_recipients:
         attempts = 3
         while attempts > 0:
             try:
-                results = topology_utils.get_vo_contacts(args)
+                results = pm.get_vo_contacts(args)
                 break
             except topology_utils.InvalidPathError as exc:
                 print(exc)
@@ -212,9 +213,9 @@ def main():
         while attempts > 0:
             try:
                 if args.fqdn_filter:
-                    results = topology_utils.get_resource_contacts_by_fqdn(args)
+                    results = pm.get_resource_contacts_by_fqdn(args)
                 else:
-                    results = topology_utils.get_resource_contacts(args)
+                    results = pm.get_resource_contacts(args)
                 break
             except topology_utils.InvalidPathError as exc:
                 exit(str(exc))

diff --git a/mappings/field_of_science.yaml b/mappings/field_of_science.yaml
diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml
@@ -72,6 +72,7 @@ SUNYUpstateMed: "SUNY Upstate Medical University"
 SWOSU: "Southwest Oklahoma State University"
 Syracuse: "Syracuse University"
 TNTech: "Tennessee Tech University"
+TAMUCT: "Texas A&M University-Central Texas"
 TexasAM: "Texas A&M University"
 UALR: "University of Arkansas at Little Rock"
 UCBerkeley: "University of California, Berkeley"

diff --git a/projects/ACE_NIAID.yaml b/projects/ACE_NIAID.yaml
@@ -17,3 +17,4 @@ ID: '782'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/451cgt72wj62'
diff --git a/projects/AMFORA.yaml b/projects/AMFORA.yaml
@@ -9,3 +9,4 @@ PIName: Ian Foster
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/o14joi278jrs'
diff --git a/projects/AMNH.astro.yaml b/projects/AMNH.astro.yaml
@@ -9,3 +9,4 @@ ID: '686'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/em2w05s9c1uc'
diff --git a/projects/AMNH.yaml b/projects/AMNH.yaml
@@ -9,3 +9,4 @@ ID: '534'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/em2w05s9c1uc'
diff --git a/projects/AMNH_Burbrink.yaml b/projects/AMNH_Burbrink.yaml
@@ -9,3 +9,4 @@ ID: '829'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/em2w05s9c1uc'
diff --git a/projects/AMNH_MacLow.yaml b/projects/AMNH_MacLow.yaml
@@ -8,3 +8,4 @@ PIName: Mordecai-Mark Mac Low
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/em2w05s9c1uc'
diff --git a/projects/AMNH_Smith.yaml b/projects/AMNH_Smith.yaml
@@ -9,3 +9,4 @@ ID: '583'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/em2w05s9c1uc'
diff --git a/projects/AMS.yaml b/projects/AMS.yaml
@@ -7,3 +7,4 @@ PIName: Baosong Shan
 Sponsor:
   VirtualOrganization:
     Name: OSG
+InstitutionID: 'https://osg-htc.org/iid/jtlq7k0qkxtn'
diff --git a/projects/ASPU.yaml b/projects/ASPU.yaml
@@ -7,3 +7,4 @@ PIName: ilyoup kwak
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/3chofmlz7p5r'
diff --git a/projects/ASU-CFD.yaml b/projects/ASU-CFD.yaml
@@ -9,3 +9,4 @@ ID: '535'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/ASU_CoMSESNet.yaml b/projects/ASU_CoMSESNet.yaml
@@ -7,3 +7,4 @@ PIName: Michael Barton
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/ASU_EvolutionMedicineIT.yaml b/projects/ASU_EvolutionMedicineIT.yaml
@@ -9,3 +9,4 @@ ID: '675'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/ASU_Jacobs.yaml b/projects/ASU_Jacobs.yaml
@@ -9,3 +9,4 @@ ID: '731'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/ASU_Ozkan.yaml b/projects/ASU_Ozkan.yaml
@@ -13,3 +13,4 @@ ID: '802'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/ASU_Pfeifer.yaml b/projects/ASU_Pfeifer.yaml
@@ -9,3 +9,4 @@ ID: '625'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/ASU_RCStaff.yaml b/projects/ASU_RCStaff.yaml
@@ -7,3 +7,4 @@ PIName: Douglas M. Jennewein
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/ASU_Singharoy.yaml b/projects/ASU_Singharoy.yaml
@@ -9,3 +9,4 @@ ID: '629'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/er1rnzey26m9'
diff --git a/projects/AdHocComm.yaml b/projects/AdHocComm.yaml
@@ -8,3 +8,4 @@ PIName: Trevor Santarra
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/n6cai04882ca'
diff --git a/projects/AfricanSchool.yaml b/projects/AfricanSchool.yaml
@@ -8,3 +8,4 @@ PIName: Rob Quick
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/uws6kivcttuc'
diff --git a/projects/AlGDock.yaml b/projects/AlGDock.yaml
@@ -15,3 +15,4 @@ PIName: David Minh
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/3jn3w1ccwxwd'
diff --git a/projects/Albany_DAES.yaml b/projects/Albany_DAES.yaml
@@ -8,3 +8,4 @@ PIName:  Ryan Torn
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/m9adt6gcsr8c'
diff --git a/projects/AllenISD_Cheon.yaml b/projects/AllenISD_Cheon.yaml
@@ -7,3 +7,4 @@ PIName: Jimin Cheon
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: "https://osg-htc.org/iid/viwzcsq6tepm"
diff --git a/projects/AmorphousOrder.yaml b/projects/AmorphousOrder.yaml
@@ -16,3 +16,4 @@ PIName: Patrick Charbonneau
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/v0pbd5jfz81s'
diff --git a/projects/AnimalSocialNetworks.yaml b/projects/AnimalSocialNetworks.yaml
@@ -36,3 +36,4 @@ PIName: Erol Akcay
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/nv2rjrft01gg'
diff --git a/projects/Arcadia_Curotto.yaml b/projects/Arcadia_Curotto.yaml
@@ -9,3 +9,4 @@ ID: '621'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/c6ehbi2dyh8h'
diff --git a/projects/Argoneut.yaml b/projects/Argoneut.yaml
@@ -7,3 +7,4 @@ PIName: Joe Boyd
 Sponsor:
   VirtualOrganization:
     Name: Fermilab
+InstitutionID: 'https://osg-htc.org/iid/ik4s3ql8u1j7'
diff --git a/projects/Arizona_Chan_Steward.yaml b/projects/Arizona_Chan_Steward.yaml
@@ -4,3 +4,4 @@ Description: Scalable astronomical data analytics for the Department of Astronom
 FieldOfScience: Physics
 Organization: University of Arizona
 PIName: Chi-kwan Chan
+InstitutionID: 'https://osg-htc.org/iid/7rjyoz6kb8vq'
diff --git a/projects/Arizona_DataScienceInstitute.yaml b/projects/Arizona_DataScienceInstitute.yaml
@@ -9,3 +9,4 @@ PIName: Nirav Merchant
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/7rjyoz6kb8vq'
diff --git a/projects/Arizona_Males.yaml b/projects/Arizona_Males.yaml
@@ -9,3 +9,4 @@ ID: '785'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/7rjyoz6kb8vq'
diff --git a/projects/Arizona_Paschalidis.yaml b/projects/Arizona_Paschalidis.yaml
@@ -9,3 +9,4 @@ ID: '648'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/7rjyoz6kb8vq'
diff --git a/projects/Arkansas_Nelson.yaml b/projects/Arkansas_Nelson.yaml
@@ -7,3 +7,4 @@ PIName: Alexander Nelson
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/78b3lgmajszi'
diff --git a/projects/Arkansas_UITSStaff.yaml b/projects/Arkansas_UITSStaff.yaml
@@ -7,3 +7,4 @@ PIName: Don DuRousseau
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/78b3lgmajszi'
diff --git a/projects/AtlasConnect.yaml b/projects/AtlasConnect.yaml
@@ -12,3 +12,4 @@ PIName: Robert William Gardner Jr
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/o14joi278jrs'
diff --git a/projects/Auburn_Hauck.yaml b/projects/Auburn_Hauck.yaml
@@ -7,3 +7,4 @@ PIName: Ruediger Hauck
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/q6cff6xb6a0h'
diff --git a/projects/BAERI_Bejaoui.yaml b/projects/BAERI_Bejaoui.yaml
@@ -8,3 +8,4 @@ PIName: Salma Bejaoui
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/za7yf0nds92q'
diff --git a/projects/BCBB_NIAID.yaml b/projects/BCBB_NIAID.yaml
@@ -7,3 +7,4 @@ PIName: Darrell Hurt
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/451cgt72wj62'
diff --git a/projects/BCH_Holt.yaml b/projects/BCH_Holt.yaml
@@ -8,3 +8,4 @@ ID: '609'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/4lvq3daxyc55'
diff --git a/projects/BCH_ResearchComputing.yaml b/projects/BCH_ResearchComputing.yaml
@@ -8,3 +8,4 @@ ID: '559'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/4lvq3daxyc55'
diff --git a/projects/BC_Grubb.yaml b/projects/BC_Grubb.yaml
@@ -9,3 +9,4 @@ ID: '830'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/lpknq8oygi06'
diff --git a/projects/BC_Savage.yaml b/projects/BC_Savage.yaml
@@ -7,3 +7,4 @@ PIName: Brian Savage
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/lpknq8oygi06'
diff --git a/projects/BGAgenomics.yaml b/projects/BGAgenomics.yaml
@@ -7,3 +7,4 @@ PIName: Sucheta Tripathy
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/6ycithqdf09t'
diff --git a/projects/BNL-PHENIX.yaml b/projects/BNL-PHENIX.yaml
@@ -8,3 +8,4 @@ PIName: Matthew Snowball
 Sponsor:
   VirtualOrganization:
     Name: OSG
+InstitutionID: 'https://osg-htc.org/iid/g29k1hhqys0y'
diff --git a/projects/BNLPET.yaml b/projects/BNLPET.yaml
@@ -11,3 +11,4 @@ PIName: Martin Purschke
 Sponsor:
   VirtualOrganization:
     Name: OSG
+InstitutionID: 'https://osg-htc.org/iid/g29k1hhqys0y'
diff --git a/projects/BNL_Schenke.yaml b/projects/BNL_Schenke.yaml
@@ -9,3 +9,4 @@ ID: '720'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/g29k1hhqys0y'
diff --git a/projects/BNL_Venugopalan.yaml b/projects/BNL_Venugopalan.yaml
@@ -5,3 +5,4 @@ Department: Physics
 FieldOfScience: Physics
 Organization: Brookhaven National Laboratory
 PIName: Raju Venugopalan
+InstitutionID: 'https://osg-htc.org/iid/g29k1hhqys0y'
diff --git a/projects/BRDMS.yaml b/projects/BRDMS.yaml
@@ -8,3 +8,4 @@ PIName: XUETONG ZHAI
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/2ayx10b74xua'
diff --git a/projects/BU_Mu2e.yaml b/projects/BU_Mu2e.yaml
@@ -9,3 +9,4 @@ ID: '825'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/drujeuinri1g'
diff --git a/projects/BYUI_Becerril.yaml b/projects/BYUI_Becerril.yaml
@@ -7,3 +7,4 @@ PIName: Héctor A. Becerril
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/vgfpbpee9lqo'
diff --git a/projects/BakerLab.yaml b/projects/BakerLab.yaml
@@ -7,3 +7,4 @@ PIName: David Baker
 Sponsor:
   VirtualOrganization:
     Name: OSG
+InstitutionID: 'https://osg-htc.org/iid/8lpmoeouw66o'
diff --git a/projects/BaylorCM_Hirschi.yaml b/projects/BaylorCM_Hirschi.yaml
@@ -9,3 +9,4 @@ ID: '726'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/gk0vqx4uormq'
diff --git a/projects/BetaDecay.yaml b/projects/BetaDecay.yaml
@@ -7,3 +7,4 @@ PIName: Liang Yang
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/10izzs5e7v1r'
diff --git a/projects/BioAlgorithms.yaml b/projects/BioAlgorithms.yaml
@@ -7,3 +7,4 @@ PIName: Natasha Pavlovikj
 Sponsor:
   VirtualOrganization:
     Name: HCC
+InstitutionID: 'https://osg-htc.org/iid/q9k1b8dfrw25'
diff --git a/projects/BioGraph.yaml b/projects/BioGraph.yaml
@@ -7,3 +7,4 @@ PIName: Alex Feltus
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/ricyf18amt49'
diff --git a/projects/BioMolMach.yaml b/projects/BioMolMach.yaml
@@ -16,3 +16,4 @@ PIName: Benoit Roux
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/o14joi278jrs'
diff --git a/projects/BioStat.yaml b/projects/BioStat.yaml
@@ -8,3 +8,4 @@ PIName: Janice McCarthy
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/v0pbd5jfz81s'
diff --git a/projects/Bioconductor.yaml b/projects/Bioconductor.yaml
@@ -8,3 +8,4 @@ PIName: Martin Morgan
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/gse6n0vl8u5c'
diff --git a/projects/BiomedInfo.yaml b/projects/BiomedInfo.yaml
@@ -8,3 +8,4 @@ PIName: Erik Wright
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/2ayx10b74xua'
diff --git a/projects/Biomim.yaml b/projects/Biomim.yaml
@@ -10,3 +10,4 @@ PIName: Puja Goyal
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/53bzboawpaq9'
diff --git a/projects/BiostatsChapple.yaml b/projects/BiostatsChapple.yaml
@@ -9,3 +9,4 @@ ID: '532'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/9idmt4uz33c1'
diff --git a/projects/BrighamAndWomens_Baratono.yaml b/projects/BrighamAndWomens_Baratono.yaml
@@ -3,3 +3,4 @@ Department: Neurology
 FieldOfScience: Biological and Biomedical Sciences
 Organization: Brigham and Women's Hospital
 PIName: Sheena R Baratono
+InstitutionID: 'https://osg-htc.org/iid/amkjjwp5fsro'
diff --git a/projects/Bucknell_IT.yaml b/projects/Bucknell_IT.yaml
@@ -9,3 +9,4 @@ ID: '695'
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/wmnibk6189rx'
diff --git a/projects/CGS.yaml b/projects/CGS.yaml
@@ -13,3 +13,4 @@ PIName: Panthea Sepehrband
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/2vxlc7g64qpj'
diff --git a/projects/CHTC-Staff.yaml b/projects/CHTC-Staff.yaml
@@ -27,3 +27,4 @@ ResourceAllocations:
       # OSG allocation
       - GroupName: TACC-Stampede2
         LocalAllocationID: "TG-DDM160003"
+InstitutionID: 'https://osg-htc.org/iid/fq8thqsj99zh'
diff --git a/projects/CHomP.yaml b/projects/CHomP.yaml
@@ -9,3 +9,4 @@ PIName: Konstantin Mischaikow
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/qrem5k97ikiv'
diff --git a/projects/CLAS12.yaml b/projects/CLAS12.yaml
@@ -8,3 +8,4 @@ Sponsor:
   VirtualOrganization:
     ID: '99'
     Name: JLab
+InstitutionID: 'https://osg-htc.org/iid/hlz41oydapzn'
diff --git a/projects/CMU_Isayev.yaml b/projects/CMU_Isayev.yaml
@@ -6,3 +6,4 @@ Organization: Carnegie-Mellon University
 PIName: Olexandr Isayev
 
 
+InstitutionID: 'https://osg-htc.org/iid/3cqqrc2cgibl'
diff --git a/projects/CMU_Romagnoli.yaml b/projects/CMU_Romagnoli.yaml
@@ -7,3 +7,4 @@ PIName: Raffaele Romagnoli
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/3cqqrc2cgibl'
diff --git a/projects/CMU_Viswanathan.yaml b/projects/CMU_Viswanathan.yaml
@@ -7,3 +7,4 @@ PIName: Venkat Viswanathan
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: 'https://osg-htc.org/iid/3cqqrc2cgibl'
diff --git a/projects/CNU_Henry.yaml b/projects/CNU_Henry.yaml
@@ -5,3 +5,4 @@ Description: >
 FieldOfScience: Computer and Information Sciences
 Organization: Christopher Newport University
 PIName: Samuel Henry
+InstitutionID: 'https://osg-htc.org/iid/a1hm0ndtf1zj'
diff --git a/projects/COVID19_FoldingAtHome.yaml b/projects/COVID19_FoldingAtHome.yaml
@@ -8,3 +8,4 @@ PIName: Greg Bowman
 Sponsor:
   CampusGrid:
     Name: OSG Connect
+InstitutionID: "https://osg-htc.org/iid/nv2rjrft01gg"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ Organization: Carnegie-Mellon University
		PIName: Olexandr Isayev


		InstitutionID: 'https://osg-htc.org/iid/3cqqrc2cgibl'