Merge pull request #39 from matyasselmeci/wip/prodbool

Simplify GridType attribute in YAMLs
opensciencegrid · May 30, 2018 · 47e5201 · 47e5201
2 parents a909097 + 415205b
commit 47e5201
Show file tree

Hide file tree

Showing 389 changed files with 400 additions and 388 deletions.
diff --git a/converters/rg_xml_to_yaml b/converters/rg_xml_to_yaml
@@ -267,6 +267,13 @@ class Topology(object):
             if self.support_centers[scname] != scid:
                 raise RuntimeError("Identical support centers with different IDs: %s" % scname)
         rg["SupportCenter"] = scname
+        gridtype = rg.pop("GridType", None)
+        if gridtype == "OSG Production Resource":
+            rg["Production"] = True
+        elif gridtype == "OSG Integration Test Bed Resource":
+            rg["Production"] = False
+        else:
+            raise RuntimeError("Missing or invalid GridType attribute")
 
         rg["Resources"] = simplify_attr_list(rg["Resources"]["Resource"], "Name")
         for key, val in rg["Resources"].items():

diff --git a/template-resourcegroup.yaml b/template-resourcegroup.yaml
@@ -1,7 +1,7 @@
 # Disable is true if the ResourceGroup is down for maintenance, false otherwise
 Disable: false
-# GridType is either "OSG Production Resource" or "OSG Integration Test Bed Resource"
-GridType: OSG Production Resource
+# Production is true if the resource is for production and not testing use
+Production: true
 # SupportCenterName is one of the support centers in topology/support-centers.yaml
 # with the format "<NAME>: <ID>"
 SupportCenterName: <NAME>

diff --git a/topology/ANL/ANL ASC/ANLASC.yaml b/topology/ANL/ANL ASC/ANLASC.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: ANL ASC Tier 3 site
 GroupID: 283
+Production: true
 Resources:
   ANL-ATLAS-GRIDFTP1:
     Active: true

diff --git a/topology/Arizona State University/OSG_US_ASU_OCTILLO/OSG_US_ASU_OCTILLO.yaml b/topology/Arizona State University/OSG_US_ASU_OCTILLO/OSG_US_ASU_OCTILLO.yaml
@@ -1,8 +1,8 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Entry for Hosted CE submitting to Arizona State University OCTILLO
   cluster.
 GroupID: 474
+Production: true
 Resources:
   OSG_US_ASU_OCTILLO:
     Active: false

diff --git a/topology/Baylor University/Baylor University Tier3/Baylor-Tier3.yaml b/topology/Baylor University/Baylor University Tier3/Baylor-Tier3.yaml
@@ -1,7 +1,7 @@
 Disable: true
-GridType: OSG Production Resource
 GroupDescription: This resource group will be used as a Tier 3 site for the CMS experiment.
 GroupID: 264
+Production: true
 Resources:
   Baylor-Tier3-CE:
     Active: false

diff --git a/topology/Baylor University/Baylor University/Baylor-Kodiak.yaml b/topology/Baylor University/Baylor University/Baylor-Kodiak.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: This resource group will be used as a Baylor University OSG site.
 GroupID: 468
+Production: true
 Resources:
   Baylor-Kodiak-CE:
     Active: true

diff --git a/topology/Bellarmine University/Bellarmine University/BELLARMINE_TIER2.yaml b/topology/Bellarmine University/Bellarmine University/BELLARMINE_TIER2.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: LSST Tier2 Site at Bellarmine University
 GroupID: 277
+Production: true
 Resources:
   BELLARMINE_TIER2:
     Active: true

diff --git a/topology/Boston University/Boston University ATLAS Tier2/BU_ATLAS_Tier2.yaml b/topology/Boston University/Boston University ATLAS Tier2/BU_ATLAS_Tier2.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: U.S. ATLAS Northeast Tier 2 Center
 GroupID: 8
+Production: true
 Resources:
   BU_ATLAS_Tier2:
     Active: false

diff --git a/topology/Boston University/Boston University ATLAS Tier2/NET2.yaml b/topology/Boston University/Boston University ATLAS Tier2/NET2.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: A resource group for Northeast ATLAS T2
 GroupID: 399
+Production: true
 Resources:
   NET2-BU:
     Active: false

diff --git a/topology/Brandeis University/Brandeis Tier 3/Brandeis-Atlas-T3.yaml b/topology/Brandeis University/Brandeis Tier 3/Brandeis-Atlas-T3.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Brandeis ATLAS Tier 3
 GroupID: 284
+Production: true
 Resources:
   BRND-HEAD:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL-ATLAS-ITB.yaml b/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL-ATLAS-ITB.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Integration Test Bed Resource
 GroupDescription: This is the BNL ITB resource group, not production services.
 GroupID: 243
+Production: false
 Resources:
   BNL-ps-testbed:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL-ATLAS-OPP.yaml b/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL-ATLAS-OPP.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Opportunistic resources utilized by the Tier 1.
 GroupID: 453
+Production: true
 Resources:
   BNL_CLOUD:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL-ATLAS.yaml b/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL-ATLAS.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: This site is the ATLAS Tier 1 Facility at Brookhaven National Laboratory.
 GroupID: 235
+Production: true
 Resources:
   BNL-LCG2:
     Active: false

diff --git a/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL_ATLAS_1.yaml b/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL_ATLAS_1.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Enable per request
 GroupID: 3
+Production: true
 Resources:
   BNL_TEST_UST3:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL_ITB_Test1.yaml b/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL_ITB_Test1.yaml
@@ -1,7 +1,7 @@
 Disable: true
-GridType: OSG Integration Test Bed Resource
 GroupDescription: disabling empty resource group
 GroupID: 6
+Production: false
 Resources:
   BNL_ATLAS_5:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL_Test_2.yaml b/topology/Brookhaven National Laboratory/Brookhaven ATLAS Tier1/BNL_Test_2.yaml
@@ -1,10 +1,10 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: This is an ATLAS production testbed. This site runs inside the OSG
   production environment, as far as BDII info publishing and other central services
   are concerned. But its main purpose is to test new ATLAS production workflow, before
   migrating them to the real ATLAS production environment.
 GroupID: 306
+Production: true
 Resources:
   BNL_Test_2_CE_1:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/Brookhaven Belle-II Tier1/BNL-Belle-II.yaml b/topology/Brookhaven National Laboratory/Brookhaven Belle-II Tier1/BNL-Belle-II.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: This is the Tier1 for Belle-II at BNL
 GroupID: 478
+Production: true
 Resources:
   BNL_BELLE_II_CE_1:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/STAR Brookhaven/STAR-BNL.yaml b/topology/Brookhaven National Laboratory/STAR Brookhaven/STAR-BNL.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: (No resource group description)
 GroupID: 102
+Production: true
 Resources:
   STAR-BNL:
     Active: true

diff --git a/topology/Brookhaven National Laboratory/STAR-Online/STAR-OnlinePool.yaml b/topology/Brookhaven National Laboratory/STAR-Online/STAR-OnlinePool.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Small pool of hosts at the STAR experiment, for STAR jobs only.
 GroupID: 426
+Production: true
 Resources:
   STAR-OnlinePool:
     Active: true

diff --git a/topology/Brown University/Brown-CMS/brown-cms.yaml b/topology/Brown University/Brown-CMS/brown-cms.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: T3 Computing center for CMS VO.
 GroupID: 241
+Production: true
 Resources:
   brown-cms:
     Active: true

diff --git a/topology/Brown University/brown-cms-new/brown-cms-new.yaml b/topology/Brown University/brown-cms-new/brown-cms-new.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: new T3 cluster
 GroupID: 346
+Production: true
 Resources:
   brown-cms-new:
     Active: true

diff --git a/topology/CBPF/GridLAFEX/PerfSONAR Services.yaml b/topology/CBPF/GridLAFEX/PerfSONAR Services.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: PerfSONAR services for the CBPF site.
 GroupID: 415
+Production: true
 Resources:
   PerfSONAR_CBPF_bw:
     Active: true

diff --git a/topology/CENF_NeutrinoPlatform/CENF/CENF_Neutrino_Computing_Cluster.yaml b/topology/CENF_NeutrinoPlatform/CENF/CENF_Neutrino_Computing_Cluster.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: 'Neutrino Computing Cluster at CERN: https://twiki.cern.ch/twiki/bin/view/CENF/NeutrinoClusterCERN'
 GroupID: 450
+Production: true
 Resources:
   CENF_NeutrinoCluster:
     Active: true

diff --git a/topology/CILogon_org/CILogon/Certificate Provider.yaml b/topology/CILogon_org/CILogon/Certificate Provider.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: For certificate provider resources
 GroupID: 444
+Production: true
 Resources:
   CILogon Certificate Provider:
     Active: true

diff --git a/topology/CUNY Graduate Center/NYSGRID-CUNY-GRID/NYSGRID-CUNY-GRID.yaml b/topology/CUNY Graduate Center/NYSGRID-CUNY-GRID/NYSGRID-CUNY-GRID.yaml
@@ -1,7 +1,7 @@
 Disable: true
-GridType: OSG Production Resource
 GroupDescription: disabling empty resource group
 GroupID: 220
+Production: true
 Resources:
   NYSGRID-CUNY-GRID:
     Active: false

diff --git a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_Cloud.yaml b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_Cloud.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Integration Test Bed Resource
 GroupDescription: Test resource group to be used for cloud tests.
 GroupID: 397
+Production: false
 Resources:
   CIT_ITB2:
     Active: true

diff --git a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2.yaml b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: (No resource group description)
 GroupID: 10
+Production: true
 Resources:
   CIT_CMS_SE:
     Active: true

diff --git a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_ITB_1.yaml b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_ITB_1.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Integration Test Bed Resource
 GroupDescription: (No resource group description)
 GroupID: 12
+Production: false
 Resources:
   CIT_ITB_1:
     Active: true

diff --git a/topology/California Institute of Technology/Caltech HEP/CIT_HEP.yaml b/topology/California Institute of Technology/Caltech HEP/CIT_HEP.yaml
@@ -1,8 +1,8 @@
 Disable: true
-GridType: OSG Production Resource
 GroupDescription: These resources are used and managed by the greater Caltech High
   Energy Physics department.
 GroupID: 292
+Production: true
 Resources:
   CIT_HEP_SE:
     Active: true

diff --git a/topology/California Institute of Technology/Caltech LIGO/LIGO-CIT-ITB.yaml b/topology/California Institute of Technology/Caltech LIGO/LIGO-CIT-ITB.yaml
@@ -1,7 +1,7 @@
 Disable: true
-GridType: OSG Integration Test Bed Resource
 GroupDescription: disabling empty resource group
 GroupID: 61
+Production: false
 Resources:
   LIGO-CIT-ITB:
     Active: false

diff --git a/topology/California Institute of Technology/Caltech LIGO/LIGO-CIT-VTB.yaml b/topology/California Institute of Technology/Caltech LIGO/LIGO-CIT-VTB.yaml
@@ -1,7 +1,7 @@
 Disable: true
-GridType: OSG Integration Test Bed Resource
 GroupDescription: (No resource group description)
 GroupID: 62
+Production: false
 Resources:
   LIGO-CIT-VTB:
     Active: false

diff --git a/topology/California State University, Fresno/CSU Fresno T3/FRESNO-ATLAS-T3.yaml b/topology/California State University, Fresno/CSU Fresno T3/FRESNO-ATLAS-T3.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Resource group at California State University, Fresno
 GroupID: 340
+Production: true
 Resources:
   FSU-TEST-SE:
     Active: true

diff --git a/topology/CancerComputer/CCHDV/CancerComputer_Hotel.yaml b/topology/CancerComputer/CCHDV/CancerComputer_Hotel.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: CE for the HPC cluster at CCHDV
 GroupID: 448
+Production: true
 Resources:
   CancerComputer_Hotel_CE:
     Active: true

diff --git a/topology/CancerComputer/CCHDV/CancerComputer_Miron.yaml b/topology/CancerComputer/CCHDV/CancerComputer_Miron.yaml
@@ -1,9 +1,9 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: The original name of the first CCHDV CE Resource.  Keeping this
   record around so that GRACC and related accounting still makes sense.  Actual resources
   are now located under the CancerComputer_Hotel resource name
 GroupID: 469
+Production: true
 Resources:
   CancerComputer_Miron_CE:
     Active: false

diff --git a/topology/CancerComputer/CCRnD/CancerComputer_Kitchener.yaml b/topology/CancerComputer/CCRnD/CancerComputer_Kitchener.yaml
@@ -1,8 +1,8 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Virtualized compute cluster at CCRnD, supporting VOs and projects
   dealing with cancer-related research
 GroupID: 479
+Production: true
 Resources:
   CancerComputer_Kitchener_CE:
     Active: true

diff --git a/topology/Cinvestav/cinvestav/cinvestav.yaml b/topology/Cinvestav/cinvestav/cinvestav.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: CE for CINVESTAV OSG resources
 GroupID: 9
+Production: true
 Resources:
   cinvestav:
     Active: true

diff --git a/topology/Clemson University/Clemson IT/Clemson-IT.yaml b/topology/Clemson University/Clemson IT/Clemson-IT.yaml
@@ -1,10 +1,10 @@
 Disable: true
-GridType: OSG Production Resource
 GroupDescription: |-
   Out of service.
 
   7/26 disabling empty resource group
 GroupID: 13
+Production: true
 Resources:
   Clemson-IT:
     Active: false

diff --git a/topology/Clemson University/Clemson IT/Clemson-Palmetto.yaml b/topology/Clemson University/Clemson IT/Clemson-Palmetto.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: osg-ce.clemson.edu
 GroupID: 212
+Production: true
 Resources:
   Clemson-Connect:
     Active: true

diff --git a/topology/Clemson University/ClemsonCS/Clemson-Birdnest.yaml b/topology/Clemson University/ClemsonCS/Clemson-Birdnest.yaml
@@ -1,7 +1,7 @@
 Disable: true
-GridType: OSG Production Resource
 GroupDescription: Cluster which provides virtualized resources to OSG.
 GroupID: 200
+Production: true
 Resources:
   Clemson-Birdnest:
     Active: false

diff --git a/topology/Clemson University/ClemsonCS/Clemson-ciTeam.yaml b/topology/Clemson University/ClemsonCS/Clemson-ciTeam.yaml
@@ -1,7 +1,7 @@
 Disable: true
-GridType: OSG Production Resource
 GroupDescription: Test resource for ciTeam at Clemson University.
 GroupID: 168
+Production: true
 Resources:
   Clemson-ciTeam:
     Active: false

diff --git a/topology/Columbia University_Nevis Labs/Nevis/Nevis.yaml b/topology/Columbia University_Nevis Labs/Nevis/Nevis.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: Nevis
 GroupID: 296
+Production: true
 Resources:
   Nevis:
     Active: true

diff --git a/topology/Computer Network Information Center (CNIC)/CAS-CNIC/CNIC-CIGI-OSG.yaml b/topology/Computer Network Information Center (CNIC)/CAS-CNIC/CNIC-CIGI-OSG.yaml
@@ -1,7 +1,7 @@
 Disable: false
-GridType: OSG Production Resource
 GroupDescription: CNIC Resources that are participating in OSG through CIGI
 GroupID: 238
+Production: true
 Resources:
   CNIC-OSG:
     Active: true