Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify GridType attribute in YAMLs #39

Merged
merged 4 commits into from
May 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions converters/rg_xml_to_yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
4 changes: 2 additions & 2 deletions template-resourcegroup.yaml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion topology/ANL/ANL ASC/ANLASC.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Disable: false
GridType: OSG Production Resource
GroupDescription: Brandeis ATLAS Tier 3
GroupID: 284
Production: true
Resources:
BRND-HEAD:
Active: true
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Disable: false
GridType: OSG Production Resource
GroupDescription: Enable per request
GroupID: 3
Production: true
Resources:
BNL_TEST_UST3:
Active: true
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Disable: false
GridType: OSG Production Resource
GroupDescription: (No resource group description)
GroupID: 102
Production: true
Resources:
STAR-BNL:
Active: true
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/Brown University/Brown-CMS/brown-cms.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/Brown University/brown-cms-new/brown-cms-new.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Disable: false
GridType: OSG Production Resource
GroupDescription: new T3 cluster
GroupID: 346
Production: true
Resources:
brown-cms-new:
Active: true
Expand Down
2 changes: 1 addition & 1 deletion topology/CBPF/GridLAFEX/PerfSONAR Services.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/CILogon_org/CILogon/Certificate Provider.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/CancerComputer/CCHDV/CancerComputer_Hotel.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/CancerComputer/CCHDV/CancerComputer_Miron.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/Cinvestav/cinvestav/cinvestav.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Disable: false
GridType: OSG Production Resource
GroupDescription: CE for CINVESTAV OSG resources
GroupID: 9
Production: true
Resources:
cinvestav:
Active: true
Expand Down
2 changes: 1 addition & 1 deletion topology/Clemson University/Clemson IT/Clemson-IT.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Disable: false
GridType: OSG Production Resource
GroupDescription: osg-ce.clemson.edu
GroupID: 212
Production: true
Resources:
Clemson-Connect:
Active: true
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/Clemson University/ClemsonCS/Clemson-ciTeam.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion topology/Columbia University_Nevis Labs/Nevis/Nevis.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Disable: false
GridType: OSG Production Resource
GroupDescription: Nevis
GroupID: 296
Production: true
Resources:
Nevis:
Active: true
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading