Merge branch 'master' into itb

* master: (21 commits) Add tests for stash/osdf scitokens.conf generation Retiring brown-osg CE Remove space from project name Update USCMS-FNAL-WC1_downtime.yaml Adding a downtime for FNAL_GPGRID_CE_04 Extends downtime for UMT Hellgate Downtime unknown. Extend to very large num per Tim C New project: CMU_Isayev Add downtime for The University of Montana due to cluster relocation Add downtime for LBL_HPCS due to colling work and SLURM update at ITD Update unit tests to reflect new osg-sunnyvale domain name Change Sunnyvale hostname Add downtime for Stashcache-Sunnyvale due to changing hostname Update OSG.yaml Update UChicago_OSGConnect.yaml Update OSG.yaml Update OSG.yaml Update UChicago_OSGConnect.yaml Adding DN to ligo Adding NEBRASKA_NRP_OSDF_ORIGIN to NDP Add CSUN -> California State University, Northridge mapping ...
matyasselmeci · Nov 8, 2023 · 34c6711 · 34c6711
2 parents 26810ae + 1887e90
commit 34c6711
Show file tree

Hide file tree

Showing 17 changed files with 535 additions and 27 deletions.
diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml
@@ -15,6 +15,7 @@ Cincinnati: "University of Cincinnati"
 Clarkson: "Clarkson University"
 Coe: "Coe College"
 Creighton: "Creighton University"
+CSUN: "California State University, Northridge"
 CUBoulder: "University of Colorado Boulder"
 CUAnschutz: "University of Colorado Anschutz Medical Campus"
 CSUSB: "California State University, San Bernadino"

diff --git a/projects/BrighamAndWomens_ Baratono.yaml → projects/BrighamAndWomens_Baratono.yaml b/projects/BrighamAndWomens_ Baratono.yaml → projects/BrighamAndWomens_Baratono.yaml
diff --git a/projects/CMU_Isayev.yaml b/projects/CMU_Isayev.yaml
@@ -0,0 +1,8 @@
+Department: Chemistry
+Description: Quantum chemical and machine learning insights into supra-molecular organization
+  of molecular crystals.
+FieldOfScience: Chemistry
+Organization: Carnegie-Mellon University
+PIName: Olexandr Isayev
+
+
diff --git a/src/tests/data/testrg.yaml b/src/tests/data/testrg.yaml
@@ -0,0 +1,246 @@
+Production: true
+SupportCenter: Self Supported
+
+GroupDescription: Test Resource Group
+
+GroupID: 91359
+
+Resources:
+  TEST_STASHCACHE_CACHE:
+    Active: true
+    Description: This is a StashCache cache server at TEST.
+    ID: 99958
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: sc-cache.test.wisc.edu
+    DN: /CN=sc-cache.test.wisc.edu
+    Services:
+      XRootD cache server:
+        Description: StashCache cache server
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - ANY
+
+  TEST_TIGER_CACHE:
+    Active: true
+    Description: This is a StashCache cache server at TEST running on the Tiger Kubernetes cluster.
+    ID: 91098
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: stash-cache.osg.test.io
+    DN: /CN=stash-cache.osg.test.io
+    Services:
+      XRootD cache server:
+        Description: StashCache cache server
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - ANY
+
+  TEST_STASHCACHE_ORIGIN:
+    Active: true
+    Description: This is a StashCache origin server at TEST.
+    ID: 99959
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: sc-origin.test.wisc.edu
+    DN: /CN=sc-origin.test.wisc.edu
+    Services:
+      XRootD origin server:
+        Description: StashCache origin server
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - ANY
+
+  TEST_STASHCACHE_ORIGIN_2000:
+    Active: true
+    Description: This is a StashCache origin server at TEST.
+    ID: 91069
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: sc-origin2000.test.wisc.edu
+    DN: /CN=sc-origin2000.test.wisc.edu
+    Services:
+      XRootD origin server:
+        Description: StashCache origin server
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - ANY
+
+  TEST_STASHCACHE_ORIGIN_AUTH_2000:
+    Active: true
+    Description: This is a StashCache origin server at TEST.
+    ID: 91192
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: origin-auth2000.test.wisc.edu
+    FQDNAliases:
+      - origin-auth.test.wisc.edu
+    DN: /CN=origin-auth2000.test.wisc.edu
+    Services:
+      XRootD origin server:
+        Description: StashCache origin server, see OPS-198
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - ANY
+
+  TEST_OSGDEV_SHOVELER_CACHE:
+    Active: true
+    Description: This is a testing StashCache cache server with a shoveler at TEST running on the Tiger Kubernetes cluster.
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: stash-cache-shoveler.osgdev.test.io
+    DN: /CN=stash-cache-shoveler.osgdev.test.io
+    Services:
+      XRootD cache server:
+        Description: StashCache cache server
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - ANY
+
+  TEST-ITB-HELM-ORIGIN:
+    Active: false
+    Description: >-
+        This is a testing OSDF origin server on the Tiger cluster,
+        deployed via Helm. It serves both public and protected data.
+    ID: 91370
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000003
+          Name: Brian Lin
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000003
+          Name: Brian Lin
+    FQDN: helm-origin.osgdev.test.io
+    DN: /CN=helm-origin.osgdev.test.io
+    Services:
+      XRootD origin server:
+        Description: xrootd stash-origin and stash-origin-auth instances
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - testvo
+
+  TEST-ITB-HELM-CACHE1:
+    Active: false
+    Description: >-
+      This is a testing StashCache cache server the Tiger cluster,
+      deployed via Helm.
+    ID: 91339
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: OSG1000003
+          Name: Brian Lin
+        Tertiary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+      Security Contact:
+        Primary:
+          ID: OSG1000002
+          Name: Matyas Selmeci
+        Secondary:
+          ID: OSG1000015
+          Name: Aaron Moate
+    FQDN: helm-cache1.osgdev.test.io
+    DN: /CN=helm-cache1.osgdev.test.io
+    Services:
+      XRootD cache server:
+        Description: StashCache cache server
+    VOOwnership:
+      testvo: 100
+    AllowedVOs:
+      - testvo
+      - OSG
+
diff --git a/src/tests/data/testvo.yaml b/src/tests/data/testvo.yaml
@@ -0,0 +1,108 @@
+AppDescription: Test VO
+CertificateOnly: false
+Community: Test VO
+Contacts:
+  Administrative Contact:
+  - ID: OSG1000015
+    Name: Aaron Moate
+  Miscellaneous Contact:
+  - ID: OSG1000018
+    Name: Christina Koch
+  Registration Authority:
+  - ID: OSG1000015
+    Name: Aaron Moate
+  Security Contact:
+  - ID: OSG1000015
+    Name: Aaron Moate
+  VO Manager:
+  - ID: 48e1c2f26dc3479a6cf9b2de7c79d654ac27b1d1
+    Name: Miron Livny
+Credentials:
+  TokenIssuers:
+    - URL: https://test.wisc.edu
+      DefaultUnixUser: vdttest
+Disable: false
+FieldsOfScience:
+  PrimaryFields:
+  - Multi-Science Community
+  SecondaryFields:
+  - Community Grid
+ID: 9999
+LongName: Test Virtual Organization
+OASIS:
+  Managers:
+    - Name: Aaron Moate
+      DNs: /DC=org/DC=doegrids/OU=People/CN=Aaron Moate 717557
+      ID: OSG1000015
+  UseOASIS: true
+PrimaryURL: https://test.wisc.edu
+PurposeURL: https://test.wisc.edu/approach.shtml
+SupportURL: https://test.wisc.edu
+
+DataFederations:
+  StashCache:
+    Namespaces:
+      - Path: /testvo/PUBLIC
+        Authorizations:
+          - PUBLIC
+        AllowedOrigins:
+          # sc-origin.test.wisc.edu
+          - TEST_STASHCACHE_ORIGIN
+          # sc-origin2000.test.wisc.edu
+          - TEST_STASHCACHE_ORIGIN_2000
+        AllowedCaches:
+          - ANY
+
+      - Path: /testvo/itb/helm-origin/PUBLIC
+        Authorizations:
+          - PUBLIC
+        AllowedOrigins:
+          # helm-origin.osgdev.test.io
+          - TEST-ITB-HELM-ORIGIN
+        AllowedCaches:
+          - ANY
+
+      - Path: /testvo/itb/helm-origin/PROTECTED
+        Authorizations:
+          - FQAN: /TESTVO
+          - DN: /DC=org/DC=cilogon/C=US/O=University of Wisconsin-Madison/CN=Matyas Selmeci A148276
+          - SciTokens:
+              Issuer: https://test.wisc.edu
+              Base Path: /testvo
+              Map Subject: False
+        AllowedOrigins:
+          # helm-origin.osgdev.test.io
+          - TEST-ITB-HELM-ORIGIN
+        AllowedCaches:
+          - ANY
+
+      - Path: /testvo
+        Authorizations:
+          - SciTokens:
+              Issuer: https://test.wisc.edu
+              Base Path: /testvo
+              Map Subject: True
+        AllowedOrigins:
+          # origin-auth2000.test.wisc.edu
+          - TEST_STASHCACHE_ORIGIN_AUTH_2000
+        AllowedCaches:
+          - ANY
+        Writeback: https://origin-auth2000.test.wisc.edu:1095
+        DirList: https://origin-auth2000.test.wisc.edu:1095
+        CredentialGeneration:
+          BasePath: /testvo
+          Strategy: OAuth2
+          Issuer: https://test.wisc.edu
+          MaxScopeDepth: 3
+
+      - Path: /testvo/issuer2test
+        Authorizations:
+          - SciTokens:
+              Issuer: https://test.wisc.edu/issuer2
+              BasePath: "/testvo/issuer2test"
+              MapSubject: False
+        AllowedOrigins:
+          # helm-origin.osgdev.test.io
+          - TEST-ITB-HELM-ORIGIN
+        AllowedCaches:
+          - ANY