Merge branch 'master' into fix-loop-bug

opensciencegrid · Feb 16, 2024 · c21d716 · c21d716
2 parents 5707f6f + ff344e0
commit c21d716
Show file tree

Hide file tree

Showing 27 changed files with 412 additions and 99 deletions.
diff --git a/projects/CNU_Henry.yaml b/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
diff --git a/projects/UCSD_Rao.yaml b/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
diff --git a/projects/UNL_Ramamurthy.yaml b/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
diff --git a/src/README.md b/src/README.md
@@ -226,7 +226,7 @@ DataFederation:
     Namespaces:
       - <NAMESPACE 1>
       - <NAMESPACE 2>
-      ...
+      # ...
       - <NAMESPACE n>
 ```
 
@@ -250,7 +250,7 @@ Alternatively:
 ```yaml
 Authorizations:
   - <DN/FQAN/SCITOKENS AUTH 1>
-  ...
+  # ...
   - <DN/FQAN/SCITOKENS AUTH n>
 ```
 These denote an authenticated namespace, which requires authentication for read access.
@@ -302,7 +302,7 @@ There are three kinds of authorization types:
 ```yaml
 AllowedOrigins:
   - ORIGIN_RESOURCE1
-  ...
+  # ...
   - ORIGIN_RESOURCEn
 ```
 AllowedOrigins is a list of resource names of origins that will serve data for this namespace.
@@ -316,7 +316,7 @@ or
 ```yaml
 AllowedCaches:
   - CACHE_RESOURCE1
-  ...
+  # ...
   - CACHE_RESOURCEn
 ```
 AllowedCaches is a list of resource names of caches that will serve data for this namespace.
@@ -389,14 +389,14 @@ For example:
 ```yaml
 Resources:
   Stashcache-Chicago:
-    ...
+    # ...
     Services:
       XRootD cache server:
         Description: Internet2 Chicago Cache
         Details:
           endpoint_override:      osg-chicago-stashcache.nrp.internet2.edu:8443
           auth_endpoint_override: osg-chicago-stashcache.nrp.internet2.edu:8444
-    ...
+    # ...
 ```
 
 ### Supporting a Namespace
@@ -577,7 +577,7 @@ The final result looks like
     },
     {
       "caches": [
-        (a whole bunch)
+        // (a whole bunch)
       ],
       "credential_generation": {
         "issuer": "https://osg-htc.org/ospool",

diff --git a/src/topology_utils.py b/src/topology_utils.py
@@ -20,6 +20,7 @@
                  "security",
                  "submitter",
                  "site",
+                 "local executive",
                  "local operational",
                  "local security"]
 

diff --git a/template-resourcegroup.yaml b/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>

diff --git a/topology/Albert Einstein Institute/GEO 600/SITE.yaml b/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
diff --git a/...ardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml b/...ardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml
@@ -8,3 +8,14 @@
   ResourceName: CARDIFF_UK_OSDF_CACHE
   Services:
   - XRootD cache server
+# ---------------------------------------------------------
+- Class: UNSCHEDULED
+  ID: 1729342507
+  Description: overloaded
+  Severity: Outage
+  StartTime: Feb 14, 2024 20:30 +0000
+  EndTime: Feb 23, 2024 20:30 +0000
+  CreatedTime: Feb 14, 2024 18:10 +0000
+  ResourceName: CARDIFF_UK_OSDF_CACHE
+  Services:
+  - XRootD cache server
diff --git a/topology/IFAE/PIC/PIC-CachingInfrastructure_downtime.yaml b/topology/IFAE/PIC/PIC-CachingInfrastructure_downtime.yaml
@@ -3,8 +3,19 @@
   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:
   - XRootD cache server
+# ----------------------------------------
+- Class: UNSCHEDULED
+  ID: 1729341656
+  Description: overloaded
+  Severity: Outage
+  StartTime: Feb 14, 2024 20:30 +0000
+  EndTime: Feb 23, 2024 20:30 +0000
+  CreatedTime: Feb 14, 2024 18:09 +0000
+  ResourceName: PIC_STASHCACHE_CACHE
+  Services:
+  - XRootD cache server
diff --git a/topology/Langston University/LU-CCRE/Langston-Lion_downtime.yaml b/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
+# ---------------------------------------------------------
+
diff --git a/topology/Montana State University/Montana State RCI/MTState-Tempest.yaml b/topology/Montana State University/Montana State RCI/MTState-Tempest.yaml
@@ -22,53 +22,41 @@ Resources:
     Active: true
     # Description is a long description of the resource; may be multiple lines
     Description: Hosted CE serving MTState
-    # 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>
+      Local Executive Contact:
+        Primary:
+          Name: Coltran Hophan-Nichols
+          ID: OSG1000661
+      Local Operational Contact:
+        Primary:
+          Name: Alexander Charles Salois
+          ID: OSG1000665
+        Secondary:
+          Name: Kenny Hanson
+          ID: OSG1000664
+        Tertiary:
+          Name: Coltran Hophan-Nichols
+          ID: OSG1000661
+      Local Security Contact:
+        Primary:
+          Name: Alexander Charles Salois
+          ID: OSG1000665
+        Secondary:
+          Name: Kenny Hanson
+          ID: OSG1000664
+        Tertiary:
+          Name: Coltran Hophan-Nichols
+          ID: OSG1000661
 
     # FQDN is the fully qualified domain name of the host running this resource
     FQDN: mtstate-tempest-ce1.svc.opensciencegrid.org

diff --git a/topology/Syracuse University/SU ITS/SyracuseCachingInfrastructure.yaml b/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
diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml b/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
+# ---------------------------------------------------------
 
diff --git a/...logy/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml b/...logy/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml
@@ -20,14 +20,13 @@
   Services:
   - XRootD cache server
 # -------------------------------------------------------
-- Class: UNSCHEDULED
-  ID: 1718169730
-  Description: HW problem
+  - Class: UNSCHEDULED
+  ID: 1729340062
+  Description: overloaded
   Severity: Outage
-  StartTime: Feb 01, 2024 20:30 +0000
-  EndTime: Feb 10, 2024 20:30 +0000
-  CreatedTime: Feb 01, 2024 19:49 +0000
+  StartTime: Feb 14, 2024 20:30 +0000
+  EndTime: Feb 23, 2024 20:30 +0000
+  CreatedTime: Feb 14, 2024 18:06 +0000
   ResourceName: Stashcache-UofA
   Services:
   - XRootD cache server
-# ---------------------------------------------------------