Merge branch 'master' into fix-loop-bug

projects/CNU_Henry.yaml

@@ -0,0 +1,7 @@
+Department: Department of Physics, Computer Science, and Engineering
+Description: >
+  Research related to biomedical and clinical natural language processing, including information retrieval, 
+  information extraction, summarization, and question answering.
+FieldOfScience: Computer and Information Sciences
+Organization: Christopher Newport University
+PIName: Samuel Henry

projects/UCSD_Rao.yaml

@@ -0,0 +1,7 @@
+Department: Electrical and Computer Engineering
+Description: >
+  Machine learning algorithms for signal processing and communications, 
+  particularly mmWave and medical imaging.
+FieldOfScience: Computer and Information Sciences
+Organization: University of California, San Diego
+PIName: Bhaskar Rao

projects/UNL_Ramamurthy.yaml

@@ -0,0 +1,5 @@
+Department: School of Computing
+Description: Research on optimizing large data transfers for science experiments
+FieldOfScience: Computer and Information Services
+Organization: University of Nebraska-Lincoln
+PIName: Byrav Ramamurthy

src/topology_utils.py

@@ -20,6 +20,7 @@
                  "security",
                  "submitter",
                  "site",
+                 "local executive",
                  "local operational",
                  "local security"]
 

template-resourcegroup.yaml

@@ -52,11 +52,44 @@ Resources:
         #   Name: <FIRSTNAME> <LASTNAME>
         #   ID: <EMAIL HASH>
 
-      # Site contact (optional) are persons or groups of people (i.e.,
-      # mailing lists) that are generally responsible for a site's
-      # relationship with the OSG (e.g., principal investigators,
-      # local administrator contact for OSG Hosted CEs)
-      # Site Contact:
+      # Local contacts are an optional set of persons or groups of
+      # people (i.e., mailing lists) if they are a different from the
+      # persons responsible for the resouce. For example, OSG Hosted
+      # CEs are operated by OSG Staff, who are separate from the local
+      # contacts that are responsible for running the site's scheduler
+
+      # (OPTIONAL) Local Executive Contacts are persons or groups of
+      # people (i.e., mailing lists) are responsible for making policy
+      # decisions regarding the site's integration with the OSG resource
+      # Local Executive Contact:
+        # Primary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Secondary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Tertiary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+
+      # (OPTIONAL) Local Operaitonal Contacts are persons or groups of
+      # people (i.e., mailing lists) that are directly responsible for the
+      # maintenance of the site's integration with the OSG resource
+      # Local Operational Contact:
+        # Primary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Secondary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Tertiary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+
+      # (OPTIONAL) Local Security Contacts are persons or groups of
+      # mailing lists) that are responsible for handling security
+      # issues related to the site's integration with the OSG resource
+      # Local Security Contact:
         # Primary:
         #   Name: <FIRSTNAME> <LASTNAME>
         #   ID: <EMAIL HASH>

topology/Albert Einstein Institute/GEO 600/SITE.yaml

@@ -0,0 +1,23 @@
+# LongName is the expanded name of the site
+LongName: Albert Einstein Institute, Hannover
+# Description is a brief description of your site
+Description: GEO 600 data server at AEI Hannover
+
+# AddressLine1 is the street address of the site
+AddressLine1: Callinstrasse 38
+### AddressLine2 (optional) is the second line of the street address
+# AddressLine2: Room 101
+# City is the city the site is located in
+City: Hannover
+
+# Country is the country the site is located in
+Country: Germany
+### State (optional) is the state or province the site is located in
+# State: Wisconsin
+### Zipcode (optional) is the zipcode/postal code of the site
+# Zipcode: "01234"
+
+# Latitude is the latitude of the site (positive values are in the northern hemisphere)
+Latitude: 52.388
+# Longitude is the longitude of the site (positive values are in the eastern hemisphere)
+Longitude: 9.711

topology/IFAE/PIC/PIC-CachingInfrastructure_downtime.yaml

@@ -3,7 +3,7 @@
   Description: XrootD issues
   Severity: Outage
   StartTime: Feb 06, 2024 20:30 +0000
-  EndTime: Feb 16, 2024 20:30 +0000
+  EndTime: Feb 8, 2024 20:30 +0000
   CreatedTime: Feb 06, 2024 21:41 +0000
   ResourceName: PIC_STASHCACHE_CACHE
   Services:

topology/Langston University/LU-CCRE/Langston-Lion_downtime.yaml

@@ -0,0 +1,12 @@
+- Class: UNSCHEDULED
+  ID: 1723377111
+  Description: Cooling issues
+  Severity: Outage
+  StartTime: Feb 07, 2024 20:00 +0000
+  EndTime: Feb 10, 2025 01:00 +0000
+  CreatedTime: Feb 07, 2024 20:28 +0000
+  ResourceName: Langston-Lion-CE1
+  Services:
+  - CE
+# ---------------------------------------------------------
+

topology/Syracuse University/SU ITS/SyracuseCachingInfrastructure.yaml

@@ -28,4 +28,4 @@ Resources:
         Description: StashCache cache server
     AllowedVOs:
       - ANY
-    DN: /DC=org/DC=incommon/C=US/ST=NY/L=Syracuse/O=Syracuse University/OU=ITS CIS UNIX/CN=its-condor-xrootd1.syr.edu
+    DN: /DC=org/DC=incommon/C=US/ST=New York/O=Syracuse University/CN=its-condor-xrootd1.syr.edu

topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml

@@ -1286,4 +1286,64 @@
   Services:
   - Squid
 # ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1724229273
+  Description: Unfortunately, we continue to have instabilities in the external network
+    and for this reason we will need to extend the downtime.
+  Severity: Severe
+  StartTime: Feb 08, 2024 20:20 +0000
+  EndTime: Feb 23, 2024 20:00 +0000
+  CreatedTime: Feb 08, 2024 20:08 +0000
+  ResourceName: UERJ_CE
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1724234439
+  Description: Unfortunately, we continue to have instabilities in the external network
+    and for this reason we will need to extend the downtime.
+  Severity: Severe
+  StartTime: Feb 08, 2024 20:20 +0000
+  EndTime: Feb 23, 2024 20:00 +0000
+  CreatedTime: Feb 08, 2024 20:17 +0000
+  ResourceName: UERJ_CE_2
+  Services:
+  - CE
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1724234872
+  Description: Unfortunately, we continue to have instabilities in the external network
+    and for this reason we will need to extend the downtime.
+  Severity: Severe
+  StartTime: Feb 08, 2024 20:20 +0000
+  EndTime: Feb 23, 2024 20:00 +0000
+  CreatedTime: Feb 08, 2024 20:18 +0000
+  ResourceName: UERJ_SQUID
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1724235056
+  Description: Unfortunately, we continue to have instabilities in the external network
+    and for this reason we will need to extend the downtime.
+  Severity: Severe
+  StartTime: Feb 08, 2024 20:20 +0000
+  EndTime: Feb 23, 2024 20:00 +0000
+  CreatedTime: Feb 08, 2024 20:18 +0000
+  ResourceName: UERJ_SQUID_2
+  Services:
+  - Squid
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1724235408
+  Description: Unfortunately, we continue to have instabilities in the external network
+    and for this reason we will need to extend the downtime.
+  Severity: Severe
+  StartTime: Feb 08, 2024 20:20 +0000
+  EndTime: Feb 23, 2024 20:00 +0000
+  CreatedTime: Feb 08, 2024 20:19 +0000
+  ResourceName: UERJ_SE
+  Services:
+  - SRMv2
+# ---------------------------------------------------------
 

topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml

@@ -19,15 +19,3 @@
   ResourceName: Stashcache-UofA
   Services:
   - XRootD cache server
-# -------------------------------------------------------
-- Class: UNSCHEDULED
-  ID: 1718169730
-  Description: HW problem
-  Severity: Outage
-  StartTime: Feb 01, 2024 20:30 +0000
-  EndTime: Feb 10, 2024 20:30 +0000
-  CreatedTime: Feb 01, 2024 19:49 +0000
-  ResourceName: Stashcache-UofA
-  Services:
-  - XRootD cache server
-# ---------------------------------------------------------

topology/University of Hawaii System/Hawaii ITS/Hawaii-Koa.yaml

@@ -0,0 +1,135 @@
+# Production is true if the resources in this group will join the production OSG pool,
+# and not the Integration Test Bed (ITB) pool.
+Production: true
+# SupportCenter is one of the support centers in topology/support-centers.yaml
+SupportCenter: Self Supported
+
+# GroupDescription is a long description of the resource group; may be multiple lines.
+GroupDescription: University of Hawaii System Koa HPC cluster
+
+# If you have an up-to-date local git clone, fill GroupID with the output from `bin/next_resource_group_id`
+# Otherwise, leave it blank and we will fill in the appropriate value for you.
+
+# Resources contains one or more resources in this
+# ResourceGroup. A resource provides one or more services
+Resources:
+  # Resource Name should be a short descriptor of the resource.
+  # e.g. the Center for High Throughput Computing's GlideinWMS Frontend is "CHTC-glidein2"
+  # Resource Names need to be unique across all resources in the OSG.
+  Hawaii-Koa-CE1:
+    Active: true
+    # Description is a long description of the resource; may be multiple lines
+    Description: Hosted CE serving University of Hawaii System Koa HPC cluster
+    # ContactLists contain information about people to contact regarding this resource.
+    # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml
+    # If you cannot find the contact above XML, please register the contact:
+    # https://opensciencegrid.org/docs/common/registration/#registering-contacts
+    ContactLists:
+      # Administrative Contacts are persons or groups of people (i.e.,
+      # mailing lists) that are directly responsible for the
+      # maintenance of the resource
+      Administrative Contact:
+        Primary:
+          Name: Jeffrey Michael Dost
+          ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba
+        # Secondary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Tertiary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+
+      # Security Contact are persons or groups of people (i.e.,
+      # mailing lists) that are responsible for handling security
+      # issues related to the resource
+      Security Contact:
+        Primary:
+          Name: Jeffrey Michael Dost
+          ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba
+        # Secondary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Tertiary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+
+      # Site contact (optional) are persons or groups of people (i.e.,
+      # mailing lists) that are generally responsible for a site's
+      # relationship with the OSG (e.g., principal investigators,
+      # local administrator contact for OSG Hosted CEs)
+      # Site Contact:
+        # Primary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Secondary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+        # Tertiary:
+        #   Name: <FIRSTNAME> <LASTNAME>
+        #   ID: <EMAIL HASH>
+
+    # FQDN is the fully qualified domain name of the host running this resource
+    FQDN: hawaii-koa-ce1.svc.opensciencegrid.org
+    ### FQDNAliases (optional) are any other DNS aliases by which this host can be accessed
+    # FQDNAliases:
+    #   - <HOSTNAME1>
+    #   - <HOSTNAME2>
+
+    ### DN (optional except for XCache resources) is the DN of the host cert of the resource
+    # in OpenSSL 1.0 format (i.e. /DC=org/DC=incommon/C=US/...)
+    # DN: <DN>
+
+    # Services is one or more services provided by this resource;
+    # valid services are listed in topology/services.yaml with the format "<SERVICE NAME>: <ID>"
+    Services:
+      CE:
+        # Description is a brief description of the service
+        Description: Hosted CE
+        ### Details (optional)
+        # Details:
+        #   # hidden
+        #   hidden: false
+        #   ### uri_override (optional, use if your service is on some non-standard URL)
+        #   # uri_override: <HOST>:<PORT>
+        #   ### sam_uri (optional)
+        #   # sam_uri: htcondor://...
+        #   ### endpoint (for perfSONAR services)
+        #   # endpoint: <HOSTNAME>
+
+      # Other services if you have any
+      # <SERVICE NAME>:
+      # ...
+
+    ### Tags (optional) is a list of tags associated with the resource.
+    ### Include the tag "CC*" if applicable for a CC* CE.
+    # Tags:
+    #   - <TAG1>
+    #   - <TAG2>
+    Tags:
+      - CC*
+
+    ### VOOwnership (optional) is the percentage of the resource owned by one or more VOs.
+    ### If part of the resource is not owned by the VO, do not list it.
+    ### The total percentage cannot exceed 100.
+    # VOOwnership:
+    #   <VO1>: <PERCENT>
+    #   <VO2>: <PERCENT>
+
+    ### WLCGInformation (optional) is only for resources that are part of the WLCG
+    # WLCGInformation:
+    #   APELNormalFactor: 0.0
+    #   HEPScore23Percentage: 0.0
+    #   AccountingName: <name>
+    #   HEPSPEC: 0
+    #   InteropAccounting: true
+    #   InteropBDII: true
+    #   InteropMonitoring: true
+    #   KSI2KMax: 0
+    #   KSI2KMin: 0
+    #   StorageCapacityMax: 0
+    #   StorageCapacityMin: 0
+    #   TapeCapacity: 0
+
+  # Other resources if you have any...
+  # <RESOURCE NAME>:
+  # ...

topology/University of Hawaii/Information Technology Center/ITC-NRP.yaml → topology/University of Hawaii System/Hawaii ITS/ITC-NRP.yaml

@@ -1,5 +1,5 @@
 GroupID: 1331
-GroupDescription: Origin for Information Technology Services (University of Hawaii, System)
+GroupDescription: Origin for Information Technology Services (University of Hawaii System)
 SupportCenter: Self Supported
 Production: true
 Resources:

topology/University of Hawaii/Information Technology Center/SITE.yaml → topology/University of Hawaii System/Hawaii ITS/SITE.yaml

@@ -1,7 +1,7 @@
 # LongName is the expanded name of the site
-LongName: University of Hawaii Information Technology Center
+LongName: University of Hawaii System Information Technology Services
 # Description is a brief description of your site
-Description: Information Technology Center at the University of Hawaii, Manoa
+Description: University of Hawaii System Information Technology Services
 
 # If you have an up-to-date local git clone, fill ID with the output from `bin/next_site_id`
 # Otherwise, leave it blank and we will fill in the appropriate value for you.

topology/University of Hawaii/Information Technology Center/UH-KoaStore.yaml → topology/University of Hawaii System/Hawaii ITS/UH-KoaStore.yaml

@@ -1,5 +1,5 @@
 Production: true
-GroupDescription: Origin for Information Technology Services (University of Hawaii, System)
+GroupDescription: Origin for Information Technology Services (University of Hawaii System)
 SupportCenter: Self Supported
 Production: true
 Resources: