Merge branch 'master' of github.com:opensciencegrid/topology

bin/compare-factory-config.py

@@ -1,7 +1,5 @@
 #!/bin/env python3
 import yaml
-import git
-import tempfile
 import sys
 import os
 import glob
@@ -192,22 +190,21 @@ def find_non_topology_matches(gfactory_DB, topology_DB, resources):
 
 
 def run(argv):
-
     # dictionary that adds GLIDEIN_ResourceNames under corresponding tags
     topology_DB = {'resources': set(),  # set of (name, fqdn) tuples
                    'sites': set(),
                    'facilities': set(),
                    'resourceGroups': set()}
     get_topology_data(topology_DB)
-    # cloning gfactory repository to a temporary directory
-    temp_dir = tempfile.mkdtemp()
-    git.Repo.clone_from(
-        'https://github.com/opensciencegrid/osg-gfactory',
-        to_path=temp_dir
-    )
+    # cloning user input osg-gfactory repository to a temporary directory
+    if len(argv) != 2:
+        print('Error: Invalid number of arguments\nUsage: compare-factory-config.py <FACTORY CONFIG GIT REPO DIR>')
+        exit(2)
+    factory_config_dir = argv[1]
+
     gfactory = []
-    gfactory.extend(glob.glob(os.path.abspath(temp_dir) + '/*.xml')
-                    + (glob.glob(os.path.abspath(temp_dir) + '/OSG_autoconf/*.yml')))
+    gfactory.extend(glob.glob(os.path.abspath(factory_config_dir) + '/*.xml')
+                    + (glob.glob(os.path.abspath(factory_config_dir) + '/OSG_autoconf/*.yml')))
     # dictionary that stores (GLIDEIN_ResourceNames: (entry name, suggestion)) pairs
     gfactory_DB = {}
     if factory_dump:
@@ -235,7 +232,9 @@ def run(argv):
         print(f'{x[0]},{x[1]},{x[2]}')
     print()  # creates an empty line gap between last record and new cmd line
 
-    shutil.rmtree(temp_dir, onerror=remove_readonly)  # file cleanup
+
+    if match_nonresource_entries:  # exit non-zero on mismatch (match_nonresource_entries is not empty)
+        exit(1)
 
 
 if __name__ == "__main__":

bin/osg-origin-authfile

@@ -4,7 +4,7 @@
 """
 A script to generate Authfiles for XCaches in the OSG
 """
-
+import argparse
 import os
 import sys
 
@@ -16,9 +16,8 @@ if __name__ == "__main__" and __package__ is None:
 import webapp.models
 import stashcache
 
-import argparse
-
 parser = argparse.ArgumentParser(description="Generate an Xrootd Authfile appropriate for a given origin.")
+parser.add_argument("--public", action="store_true", help="Generate a public origin Authfile")
 parser.add_argument("fqdn", metavar="Origin_FQDN", nargs=1, help="FQDN of the origin for Authfile generation.")
 
 args = parser.parse_args()
@@ -28,6 +27,6 @@ global_data = webapp.models.GlobalData()
 VOData = global_data.get_vos_data()
 ResourceGroups = global_data.get_topology().get_resource_group_list()
 
-authfile = stashcache.generate_origin_authfile(args.fqdn[0], VOData, ResourceGroups, suppress_errors=False)
+authfile = stashcache.generate_origin_authfile(args.fqdn[0], VOData, ResourceGroups, suppress_errors=False, public_only=args.public)
 
 print(authfile, end="")

mappings/project_institution.yaml

@@ -43,6 +43,7 @@ Repertoire: "Repertoire Immune Medicines"
 Rochester: "University of Rochester"
 Rowan: "Rowan University"
 RPI: "Rensselaer Polytechnic Institute"
+SalemState: "Salem State University"
 SIUE: "Southern Illinois University Edwardsville"
 SDSU: "San Diego State University"
 SWOSU: "Southwest Oklahoma State University"

projects/CMU_Viswanathan.yaml

@@ -0,0 +1,9 @@
+Department: Department of Mechanical Engineering
+Description: Physics-informed machine learning algorithms to facilitate improved prediction of battery performance
+FieldOfScience: Mechanical Engineering
+Organization: Carnegie-Mellon University
+PIName: Venkat Viswanathan
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/OSG-Staff.yaml

@@ -2,7 +2,7 @@ Department: Computing Sector
 Description: Integration and testing of science applications for new users
 FieldOfScience: Computer and Information Science and Engineering
 ID: '6'
-Organization: Fermilab
+Organization: OSG
 PIName: Frank Wuerthwein
 Sponsor:
   VirtualOrganization:

projects/PSU_Kennea.yaml

@@ -0,0 +1,9 @@
+Department: Department of Astronomy and Astrophysics
+Description: Swift BAT data to localize Gamma-ray Bursts 
+FieldOfScience: Astronomy
+Organization: Pennsylvania State University
+PIName: Jamie Kennea
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/SalemState_Poitevin.yaml

@@ -0,0 +1,9 @@
+Department: Department of Mathematics
+Description: Find segments of nucleotides in different genomes that can be parsed both visually and phonetically.
+FieldOfScience: Visual Arts
+Organization: Salem State University
+PIName: Pedro Poitevin
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/TG-BIO200038.yaml

@@ -0,0 +1,11 @@
+Description: >
+  RNAMake Science Gateway: a public resource for the design
+  and analysis of RNA 3D structure for custom nanomachines
+Department: Chemistry
+FieldOfScience: Biophysics
+Organization: University of Nebraska-Lincoln
+PIName: Joseph Yesselman
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/TG-TRA090005.yaml

@@ -0,0 +1,9 @@
+Description: Campus Champion Allocation for University of Michigan
+Department: Advanced Research Computing - Technology Services
+FieldOfScience: Training
+Organization: University of Michigan
+PIName: Michelle Johnson
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/TG-TRA220014.yaml

@@ -0,0 +1,14 @@
+Description: This Campus Champions allocation will primarily be used
+  to allow USDA-ARS SCINet (https://scinet.usda.gov/) users to
+  evaluate Jetstream as a possible alternative to public cloud (AWS,
+  Azure) resources, which can be administratively difficult to
+  obtain; as well as evaluate resources (e.g., newer GPU models) that
+  are unavailable on SCINet HPC clusters.
+Department: Corn Insects and Crop Genetics Research Unit
+FieldOfScience: Training
+Organization: USDA Agricultural Research Service
+PIName: Nathan Weeks
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/Training-ACE-NIAID.yaml

@@ -0,0 +1,9 @@
+Description: Group for ACE training (through NIAID/NIH) 
+Department: Bioinformatics and Computational Biosciences Branch (BCBB)
+FieldOfScience: Biological Sciences
+Organization: NIAID/NIH
+PIName: Mariam Quiñones 
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/UCDavis_Leveau.yaml

@@ -0,0 +1,9 @@
+Department: Department of Plant Pathology
+Description: Study of plant-microbe interactions specifically pertaining to microbes in the phyllosphere (leaf surface)
+FieldOfScience: Biological and Biomedical Sciences
+Organization: University of California, Davis
+PIName: Johan Leveau
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/UCSD_Duarte.yaml

@@ -0,0 +1,9 @@
+Department: Department of Physics
+Description: Machine learning (ML) development for particle physics, primarily for the CMS experiment at the CERN Large Hadron Collider.
+FieldOfScience: High Energy Physics
+Organization: University of California, San Diego
+PIName: Javier Duarte
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

projects/UND_Delhommelle.yaml

@@ -0,0 +1,10 @@
+Description: Unraveling Crystallization and Phase Transition Processes
+  through Topology, Rare-Event Simulations, and Machine Learning
+Department: Chemistry
+FieldOfScience: Physical Chemistry
+Organization: University of North Dakota
+PIName: Jerome Delhommelle
+
+Sponsor:
+  CampusGrid:
+    Name: OSG Connect

topology/Boston University/Boston University ATLAS Tier2/BU_ATLAS_Tier2_downtime.yaml

@@ -179,3 +179,14 @@
   - CE
   - GridFtp
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1085853095
+  Description: 'GPFS issue retiring old pool.  Need a few hours without DDM to fix. '
+  Severity: Severe
+  StartTime: Jan 30, 2022 23:45 +0000
+  EndTime: Jan 31, 2022 12:00 +0000
+  CreatedTime: Jan 30, 2022 23:28 +0000
+  ResourceName: NET2
+  Services:
+  - GridFtp
+# ---------------------------------------------------------

topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml

@@ -1800,8 +1800,8 @@
   ID: 997651556
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_SE
   Services:
@@ -1811,8 +1811,8 @@
   ID: 997651557
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_T2
   Services:
@@ -1822,8 +1822,8 @@
   ID: 997651558
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_T2B
   Services:
@@ -1833,8 +1833,8 @@
   ID: 997651559
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_T2C
   Services:
@@ -1844,8 +1844,8 @@
   ID: 997651560
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_T2_Squid
   Services:
@@ -1855,8 +1855,8 @@
   ID: 997651561
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_T2_2_Squid
   Services:
@@ -1866,8 +1866,8 @@
   ID: 997651562
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT-CMS-T2-XRD
   Services:
@@ -1877,8 +1877,8 @@
   ID: 997651563
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_SE_Ceph
   Services:
@@ -1888,10 +1888,57 @@
   ID: 997651564
   Description:  Networking upgrades, Power station switch
   Severity: Outage
-  StartTime: Feb 07, 2022 07:00 -0800
-  EndTime: Feb 08, 2022 17:00 -0800
+  StartTime: Feb 18, 2022 17:00 -0800
+  EndTime: Feb 22, 2022 17:00 -0800
   CreatedTime: Jan 21, 2022 17:00 -0800
   ResourceName: CIT_CMS_T2_XRD_Ceph
   Services:
     - XRootD component
 
+# ----------------------------------------
+# Replacing faulty storage headnodes
+#
+- Class: SCHEDULED
+  ID: 997651565
+  Description:  Replacing faulty storage nodes
+  Severity: Outage
+  StartTime: Feb 7, 2022 09:00 -0800
+  EndTime: Feb 7, 2022 12:00 -0800
+  CreatedTime: Feb 04, 2022 15:00 -0800
+  ResourceName: CIT_CMS_SE
+  Services:
+    - GridFtp
+
+- Class: SCHEDULED
+  ID: 997651566
+  Description:  Replacing faulty storage nodes
+  Severity: Outage
+  StartTime: Feb 7, 2022 09:00 -0800
+  EndTime: Feb 7, 2022 12:00 -0800
+  CreatedTime: Feb 04, 2022 15:00 -0800
+  ResourceName: CIT-CMS-T2-XRD
+  Services:
+    - XRootD component
+
+- Class: SCHEDULED
+  ID: 997651567
+  Description:  Replacing faulty storage nodes
+  Severity: Outage
+  StartTime: Feb 7, 2022 09:00 -0800
+  EndTime: Feb 7, 2022 12:00 -0800
+  CreatedTime: Feb 04, 2022 15:00 -0800
+  ResourceName: CIT_CMS_SE_Ceph
+  Services:
+    - GridFtp
+
+- Class: SCHEDULED
+  ID: 997651568
+  Description:  Replacing faulty storage nodes
+  Severity: Outage
+  StartTime: Feb 7, 2022 09:00 -0800
+  EndTime: Feb 7, 2022 12:00 -0800
+  CreatedTime: Feb 04, 2022 15:00 -0800
+  ResourceName: CIT_CMS_T2_XRD_Ceph
+  Services:
+    - XRootD component
+