HTCONDOR-3323: Report on osg-htc.org Hosted CEs

[mwestphall]

Update MONITOR_COLLECTOR_CONSTRAINT to accept CEs with an osg-htc.org fqdn

[mwestphall]

Regex is slightly hard to follow, a couple test cases:

>>> import re
>>> expr = r"hosted-ce.*\.(grid\.uchicago\.edu|opensciencegrid\.org|osg-htc\.org)|.*\.svc\.(opensciencegrid|osg-htc)\.org"  
>>> re.match(expr, "hosted-ce.foo.grid.uchicago.edu")
<re.Match object; span=(0, 31), match='hosted-ce.foo.grid.uchicago.edu'>
>>> re.match(expr, "hosted-ce.foo.opensciencegrid.org")
<re.Match object; span=(0, 33), match='hosted-ce.foo.opensciencegrid.org'>
>>> re.match(expr, "hosted-ce.foo.osg-htc.org")
<re.Match object; span=(0, 25), match='hosted-ce.foo.osg-htc.org'>
>>> re.match(expr, "foo.svc.opensciencegrid.org")
<re.Match object; span=(0, 27), match='foo.svc.opensciencegrid.org'>
>>> re.match(expr, "foo.svc.osg-htc.org")
<re.Match object; span=(0, 19), match='foo.svc.osg-htc.org'>
>>> re.match(expr, "foo.svc.osg-ht.org")
>>> re.match(expr, "foo.svc.openscience.org")

[tannenba]

LGTM.

I did a sanity by using the old constraint with condor_status, followed by the new constraint. The new constraint returned the same hosts as the old PLUS the new CEs in the osg-htc.org domain just like we want. Behold:

$ condor_status -pool collector.opensciencegrid.org:9619 -schedd -cons 'regexp("hosted-ce.(.grid.uchicago.edu|.opensciencegrid.org)|..svc.opensciencegrid.org", Machine)' -af machine > old.txt

$ condor_status -pool collector.opensciencegrid.org:9619 -schedd -cons 'regexp("hosted-ce..(grid.uchicago.edu|opensciencegrid.org|osg-htc.org)|..svc.(opensciencegrid|osg-htc).org", Machine)' -af machine > new.txt

$ diff old.txt new.txt
6a7
-> chtc-spark-ce1.svc.osg-htc.org
8a10
-> computecanada-fir-ce1.svc.osg-htc.org
35a38
-> pdx-orca-ce1.svc.osg-htc.org
44a48
-> tacc-stampede3-ce1.svc.osg-htc.org

[rynge]

LGTM