Merge branch 'master' into itb

* master: (69 commits)
  Update topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml
  Activated Kent State; FD #71868
  Rename CSUNorthridge_Katz.yaml to CSUN_Katz.yaml
  Create CSUNorthridge_Katz.yaml
  Removing downtime from OSDF Chicago cache
  Update JLab-Farm.yaml
  Add MiamiOH -> Miami University mapping used in opensciencegrid#3446
  Create MiamiOH_Staff.yaml
  Deactivates tacc-stampede2-ce1
  Add downtime for CHICAGO I2 cache due to node offline
  deactivate old SUT CE
  disable NDSU thunder CE
  deactivate old ASU SLATE CE
  Sets old nd caml gpu to inactive
  ResourceAllocations changes for TG-CHE200122
  Move downtime for BNL_CLOUD to the downtime file for its ResourceGroup
  add dCache downtime and Network downtime
  projects -> project
  Fixing FQAN
  Allow AP22 users to access /ospool/uc-shared/projects (UCOPS-114)
  ...

mappings/project_institution.yaml

@@ -35,6 +35,7 @@ LoyolaChicago: "Loyola University Chicago"
 LSMSA: "Louisiana School for Math, Science, and the Arts"
 LSU: "Louisiana State University"
 LSUHSC: "Louisiana State University Health Sciences Center"
+MiamiOH: "Miami University"
 Michigan: "University of Michigan"
 Mines: "Colorado School of Mines"
 MIT: "Massachusetts Institute of Technology"
@@ -50,6 +51,7 @@ NJIT: "New Jersey Institute of Technology"
 NMSU: "New Mexico State University"
 NOAA: "National Oceanic and Atmospheric Administration"
 Northeastern: "Northeastern University"
+NorthwesternMed: "Northwestern Medicine"
 NSHE: "Nevada System of Higher Education"
 OHSU: "Oregon Health & Science University"
 OSU: "The Ohio State University"

projects/Auburn_Hauck.yaml

@@ -0,0 +1,9 @@
+Department: Pathobiology
+Description: Experimental infections with avian reovirus and co-infections with other micro-organisms. We analyze bioinformatic data pertaining to microbiome, gene expression, metagenome and transcriptome obtained from these experiments.
+FieldOfScience: Agricultural Sciences specifically Poultry Science
+Organization: Auburn University
+PIName: Ruediger Hauck
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/CSUN_Katz.yaml

@@ -0,0 +1,6 @@
+Department: Department of Mathematics
+Description: Large scale searches for binary sequences with identical autocorrelation
+  spectra (https://arxiv.org/abs/2308.07467).
+FieldOfScience: Mathematics
+Organization: California State University, Northridge
+PIName: Daniel Katz

projects/IIT_Rosa.yaml

@@ -0,0 +1,9 @@
+Description: "Generating trajectories in high-dimensional parameter spaces using numerical continuation methods.  The software repo is available here: https://github.com/nr-codes/BipedalGaitGeneration."
+Department: Mechanical, Materials, and Aerospace Engineering Deptartment
+FieldOfScience: Mechanical Engineering
+Organization: Illinois Institute of Technology
+PIName: Nelson Rosa
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/MiamiOH_Staff.yaml

@@ -0,0 +1,9 @@
+Department: Research Office
+Description: Staff at Miami University in Ohio
+FieldOfScience: Research Computing
+Organization: Miami University
+PIName: Jens Mueller
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/ND_Chen.yaml

@@ -0,0 +1,5 @@
+Department: College of Engineering
+Description: Training AI models on public medical image data
+FieldOfScience: Engineering
+Organization: University of Notre Dame
+PIName: Danny Chen

projects/NorthwesternMed_Yadav.yaml

@@ -0,0 +1,6 @@
+Department: Department of Radiation Oncology
+Description: 'Monte Carlo simulations of the Boltzmann radiation transport equation to investigate radiation absorbed dose delivered from megavoltage linear accelerators. '
+FieldOfScience: Physics
+Organization: Northwestern Medicine
+PIName: Poonam Yadav
+

projects/TG-CHE200122.yaml

@@ -29,19 +29,14 @@ ResourceAllocations:
   - Type: XRAC
     SubmitResources:
       - CHTC-XD-SUBMIT
+      - CHTC-ap40
     ExecuteResourceGroups:
       - GroupName: SDSC-Expanse
         LocalAllocationID: "cwr109"
-      # Bridges2
-      - GroupName: PSC-Bridges2
-        LocalAllocationID: "che200052p"
-      # Stampede2 (OSG allocation)
-      - GroupName: TACC-Stampede2
-        LocalAllocationID: "TG-DDM160003"
   - Type: Other
     SubmitResources:
       - CHTC-XD-SUBMIT
-      - UChicago_OSGConnect_login04
+      - CHTC-ap40
     ExecuteResourceGroups:
       - GroupName: TACC-Frontera
         LocalAllocationID: "CHE20009"

projects/UCLA_Huang.yaml

@@ -0,0 +1,11 @@
+Description: Studying $\Omega$-hadron correlation to search for signatures of baryon junction mechanisms at RHIC BES energies.
+Department: Physics and Astronomy
+FieldOfScience: Astronomy
+Organization: Arizona State University
+PIName: Huan Zhong Huang
+
+ID: '731'
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/UTA_Jones.yaml

@@ -0,0 +1,7 @@
+Description: >
+  works on the NEXT neutrinoless double beta decay experiment: https://next.ific.uv.es/next/ which is an international collaboration. 
+  The experiment is trying to determine if the neutrino is its own anti-particle.
+Department: Physics
+FieldOfScience: Physics
+Organization: University of Texas at Arlington
+PIName: Ben Jones

projects/UWMadison_DeWerd.yaml

@@ -0,0 +1,6 @@
+Department: Medical Physics
+Description: Simulations for radiation therapy applications
+FieldOfScience: Physics
+Organization: University of Wisconsin-Madison
+PIName: Larry DeWerd
+

projects/Washington_Savage.yaml

@@ -0,0 +1,9 @@
+Description: Quantum simulations of many-body systems for nuclear and high-energy physics (https://iqus.uw.edu).
+Department: IQuS, Department of Physics
+FieldOfScience: Physics
+Organization: University of Washington
+PIName: Martin J. Savage
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

src/templates/iframe.html.j2

@@ -221,7 +221,28 @@ will want to adjust the Map.data which populates the select input and legend.
     const storage_services = new Set(["Squid", "SRMv2", "XRootD cache server", "GridFtp", "XRootD component", "XRootD origin server", "SRMv1", "LFC", "Apache Server", "FTS"]);
     const network_services = new Set(["net.perfSONAR.Bandwidth", "net.perfSONAR.Latency"]);
     const ospool_resources = new Set([
-        "SU-ITS-CE3", "Expanse-PATH-EP", "SU-ITS-CE2", "Lancium-PEP", "UNL-PATH-EP", "UConn-HPC", "SDSC-PRP-OSPool-Provisioner", "IU-Jetstream2-Backfill", "Lancium-Backfill", "WISC-PATH-EP", "GPGrid", "MWT2", "GLOW", "Purdue-Geddes", "Lehigh - Hawk", "UW-IT", "NWICG_NDCMS", "UColorado_HEP", "TACC-Jetstream-Backfill", "UConn-OSG", "GPN-GP-ARGO-Backfill", "AMNH-Mendel-CE1", "BNL-ATLAS", "TCNJ-ELSA", "CUmulus-Backfill", "AMNH-HEL-CE1", "Rice-RAPID-Backfill", "OSG_US_FSU_HNPGRID", "GP-ARGO-wichita-backfill", "SDSC-PRP-CE1", "UA-HPC-CE1", "VU-AUGIE", "SIUE-CC-production", "GP-ARGO-dsu-backfill", "SLATE_US_NMSU_DISCOVERY", "UC-Denver-CE1", "UTC-Epyc", "Crane", "AGLT2", "GP-ARGO-uams-backfill", "SYRA-PATH-EP", "GP-ARGO-oru-backfill", "USCMS-FNAL-WC1", "GP-ARGO-sdsmt-backfill", "GP-ARGO-sdsu-backfill", "GP-ARGO-astate-backfill", "GP-ARGO-usd-backfill", "Georgia_Tech_PACE_CE_2", "GP-ARGO-ksu-backfill", "GP-ARGO-emporia-backfill", "Rhodes-HPC-CE1", "Swan-CE1", "GP-ARGO-langston-backfill", "GP-ARGO-uark-backfill", "GP-ARGO-creighton-backfill", "ODU-Ubuntu", "LSUHSC-Tigerfish-CE1", "WTAMU_HPC", "ASU-DELL_M420", "GP-ARGO-mst-backfill", "GP-ARGO-ku-backfill", "uprm-cms", "WSU-GRID", "USC-CARC-Artemis-Backfill", "FANDM-ITS", "Clarkson-ACRES-CE2", "NMSU-Discovery-CE1", "LC-ITS", "Rhino", "UA-LR-ITS-EP", "PDX-Coeus-CE1", "GP-ARGO-osu-backfill", "Nebraska", "cinvestav", "ISI", "Purdue-Anvil-Composable", "GP-ARGO-kanren-backfill", "GSU-ACIDS", "Clemson-Palmetto", "LSUHSC-Tigerfish-CE2", "AMNH-ARES-CE1", "GP-ARGO-doane-backfill", "LSU-DB-CE1", "CHTC", "CHTC-canary2", "NMSU-Discovery", "KSU-Beocat-CE1", "WSU-GRID-CE1", "GP-ARGO-cameron-backfill", "SPRACE", "ND_CAMLGPU", "CYBERA_EDMONTON", "UMissHEP", "USF", "Maine-ACG", "Clarkson-ACRES", "FIU-PATH-BACKFILL", "GP-ARGO-semo-backfill", "AMNH-ARES", "FIU-IRCC", "Alabama-CHPC-CE1", "TIGER-OSG-BACKFILL-PROD", "CIT_CMS_T2", "UCR-HPCC-CE1", "Tufts-Cluster", "Purdue-Anvil-CE1", "IIT_CE2", "IIT_CE1", "CHTC-GPU-EP", "Maine-ACG-CE1", "NCSU-HPC-CE1", "SLATE_US_UUTAH_LONEPEAK", "USC-CARC-Carina-Backfill", "SLATE_US_UUTAH_NOTCHPEAK", "ISI_ImageTest", "SLATE_US_UUTAH_KINGSPEAK", "Wilson Facility"
+        "UMT-Hellgate-CE1", "SU-ITS-CE3", "Expanse-PATH-EP", "SU-ITS-CE2", "Lancium-PEP", "UNL-PATH-EP", "UConn-HPC",
+        "SDSC-PRP-OSPool-Provisioner", "IU-Jetstream2-Backfill", "Lancium-Backfill", "WISC-PATH-EP", "GPGrid", "MWT2",
+        "GLOW", "Purdue-Geddes", "Lehigh - Hawk", "UW-IT", "NWICG_NDCMS", "UColorado_HEP", "TACC-Jetstream-Backfill",
+        "UConn-OSG", "GPN-GP-ARGO-Backfill", "AMNH-Mendel-CE1", "BNL-ATLAS", "TCNJ-ELSA", "CUmulus-Backfill",
+        "AMNH-HEL-CE1", "Rice-RAPID-Backfill", "OSG_US_FSU_HNPGRID", "GP-ARGO-wichita-backfill", "SDSC-PRP-CE1",
+        "UA-HPC-CE1", "VU-AUGIE", "SIUE-CC-production", "GP-ARGO-dsu-backfill", "SLATE_US_NMSU_DISCOVERY",
+        "UC-Denver-CE1", "UTC-Epyc", "Crane", "AGLT2", "GP-ARGO-uams-backfill", "SYRA-PATH-EP", "GP-ARGO-oru-backfill",
+        "USCMS-FNAL-WC1", "GP-ARGO-sdsmt-backfill", "GP-ARGO-sdsu-backfill", "GP-ARGO-astate-backfill",
+        "GP-ARGO-usd-backfill", "Georgia_Tech_PACE_CE_2", "GP-ARGO-ksu-backfill", "GP-ARGO-emporia-backfill",
+        "Rhodes-HPC-CE1", "Swan-CE1", "GP-ARGO-langston-backfill", "GP-ARGO-uark-backfill",
+        "GP-ARGO-creighton-backfill", "ODU-Ubuntu", "LSUHSC-Tigerfish-CE1", "WTAMU_HPC", "ASU-DELL_M420",
+        "GP-ARGO-mst-backfill", "GP-ARGO-ku-backfill", "uprm-cms", "WSU-GRID", "USC-CARC-Artemis-Backfill",
+        "FANDM-ITS", "Clarkson-ACRES-CE2", "NMSU-Discovery-CE1", "LC-ITS", "Rhino", "UA-LR-ITS-EP",
+        "PDX-Coeus-CE1", "GP-ARGO-osu-backfill", "Nebraska", "cinvestav", "ISI", "Purdue-Anvil-Composable",
+        "GP-ARGO-kanren-backfill", "GSU-ACIDS", "Clemson-Palmetto", "LSUHSC-Tigerfish-CE2", "AMNH-ARES-CE1",
+        "GP-ARGO-doane-backfill", "LSU-DB-CE1", "CHTC", "CHTC-canary2", "NMSU-Discovery", "KSU-Beocat-CE1",
+        "WSU-GRID-CE1", "GP-ARGO-cameron-backfill", "SPRACE", "ND_CAMLGPU", "CYBERA_EDMONTON", "UMissHEP",
+        "USF", "Maine-ACG", "Clarkson-ACRES", "FIU-PATH-BACKFILL", "GP-ARGO-semo-backfill", "AMNH-ARES",
+        "FIU-IRCC", "Alabama-CHPC-CE1", "TIGER-OSG-BACKFILL-PROD", "CIT_CMS_T2", "UCR-HPCC-CE1", "Tufts-Cluster",
+        "Purdue-Anvil-CE1", "IIT_CE2", "IIT_CE1", "CHTC-GPU-EP", "Maine-ACG-CE1", "NCSU-HPC-CE1",
+        "SLATE_US_UUTAH_LONEPEAK", "USC-CARC-Carina-Backfill", "SLATE_US_UUTAH_NOTCHPEAK", "ISI_ImageTest",
+        "SLATE_US_UUTAH_KINGSPEAK", "Wilson Facility"
     ].map(x => x.toLowerCase()))
 
     const iconConfig = {
@@ -545,7 +566,8 @@ will want to adjust the Map.data which populates the select input and legend.
 
             // Check for zoom and location inputs
             if(window.location.hash){
-                let viewportComponents = window.location.hash.split("#")[1].split("|");
+                let decodedHash = decodeURI(window.location.hash)
+                let viewportComponents = decodedHash.split("#")[1].split("|");
                 [latitude, longitude] = viewportComponents[0].split(',')
                 zoom = viewportComponents[1]
             }

src/tests/test_stashcache.py

@@ -96,8 +96,8 @@ def test_cache_grid_mapfile_nohost(self, client: flask.Flask):
             mm = GRID_MAPPING_REGEX.match(line)
             if mm:
                 dn = mm.group(1)
-                if "CN=Brian Paul Bockelman" in dn or "CN=Matyas Selmeci A148276" in dn:
-                    # HACK: these two have their FQANs explicitly allowed in some namespaces so it's OK
+                if "CN=Brian Paul Bockelman" in dn or "CN=Matyas Selmeci A148276" in dn or "CN=Judith Lorraine Stephen" in dn:
+                    # HACK: these three have their FQANs explicitly allowed in some namespaces so it's OK
                     # for them to show up in grid-mapfiles even without an FQDN
                     continue
                 else:

src/tests/verify_resources.py

@@ -141,7 +141,7 @@ def main():
     errors += test_14_vo_contacts_match(vos, vofns, contacts)
     # per SOFTWARE-3329, we are not checking support center contacts
 #   errors += test_14_sc_contacts_match(support_centers, contacts)
-    errors += test_15_facility_site_files()
+    errors += test_15_site_files()
     errors += test_16_Xrootd_DNs(rgs, rgfns)
     errors += test_17_osdf_data(rgs, rgfns)
     warnings += test_18_osdf_data_cache_warnings(rgs, rgfns, vomap)
@@ -190,7 +190,6 @@ def main():
                                " or a CILogonID",
     'UnknownContactID'       : "Contact IDs must exist in contact repo",
     'ContactNameMismatch'    : "Contact names must match in contact repo",
-    'NoFacility'             : "Facility directories must contain a FACILITY.yaml",
     'NoSite'                 : "Site directories must contain a SITE.yaml",
     'XrootdWithoutDN'        : "Xrootd cache server must provide a DN",
     'OSDFServiceVOsList'     : "OSDF Services must contain an AllowedVOs list",
@@ -663,16 +662,9 @@ def test_14_sc_contacts_match(support_centers, contacts):
     return errors
 
 
-def test_15_facility_site_files():
-    # verify the required FACILITY.yaml and SITE.yaml files
+def test_15_site_files():
+    # verify the required SITE.yaml files
     errors = 0
-
-    for facdir in glob.glob("*/"):
-        if not os.path.exists(facdir + "FACILITY.yaml"):
-            print_emsg_once('NoFacility')
-            print("ERROR: " + facdir[:-1] + " does not have required FACILITY.yaml file")
-            errors += 1
-
     for sitedir in glob.glob("*/*/"):
         if not os.path.exists(sitedir + "SITE.yaml"):
             print_emsg_once('NoSite')

src/webapp/rg_reader.py

@@ -69,21 +69,17 @@ def get_topology(indir="../topology", contacts_data=None, strict=False):
 
     skip_msg = "skipping (non-strict mode)"
 
-    for facility_path in root.glob("*/FACILITY.yaml"):
-        name = facility_path.parts[-2]
-        facility_data = load_yaml_file(facility_path)
+    for facility_path in root.glob("*"):
+        if not os.path.isdir(facility_path):
+            continue
+        name = facility_path.parts[-1]
+        facility_yaml_path = facility_path / 'FACILITY.yaml'
+        facility_data = load_yaml_file(facility_yaml_path) if facility_yaml_path.exists() else {}
         id_ = gen_id_from_yaml(facility_data or {}, name)
         topology.add_facility(name, id_)
     for site_path in root.glob("*/*/SITE.yaml"):
         facility, name = site_path.parts[-3:-1]
-        if facility not in topology.facilities:
-            msg = f"Missing facility {facility} for site {name}.  Is there a FACILITY.yaml?"
-            if strict:
-                raise TopologyError(msg)
-            else:
-                log.error(msg)
-                log.error(skip_msg)
-                continue
+        assert facility in topology.facilities, f"Missing facility {facility} for site {name}"
         site_info = load_yaml_file(site_path)
         id_ = gen_id_from_yaml(site_info, name)
         topology.add_site(facility, name, id_, site_info)

topology/Arizona State University/ASU Research Computing/OSG_DELL_M420_ASU.yaml

@@ -33,7 +33,7 @@ Resources:
         Details:
           hidden: false
   ASU-DELL_M420:
-    Active: true
+    Active: false
     ID: 1086
     Description: The SLATE hosted CE instance for the ASU test cluster
     ContactLists:

topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS-OPP_downtime.yaml

@@ -0,0 +1,22 @@
+- Class: SCHEDULED
+  ID: 1630657310
+  Description: dCache Downtime
+  Severity: Outage
+  StartTime: Oct 31, 2023 14:00 +0000
+  EndTime: Oct 31, 2023 23:00 +0000
+  CreatedTime: Oct 23, 2023 12:55 +0000
+  ResourceName: BNL_CLOUD
+  Services:
+  - Submit Node
+# ---------------------------------------------------------
+- Class: SCHEDULED
+  ID: 1630658688
+  Description: Network downtime
+  Severity: Outage
+  StartTime: Dec 19, 2023 11:00 +0000
+  EndTime: Dec 20, 2023 02:00 +0000
+  CreatedTime: Oct 23, 2023 12:57 +0000
+  ResourceName: BNL_CLOUD
+  Services:
+  - Submit Node
+# ---------------------------------------------------------