Merge pull request #140 from matyasselmeci/pr/queue-in-resourcecatalog.SOFTWARE-5881

Add "Queue" attribute to entries in OSG_ResourceCatalog (SOFTWARE-5881)

Author: matyasselmeci

osg_configure/modules/resourcecatalog.py

@@ -31,7 +31,7 @@ class RCAttribute(namedtuple("RCAttribute", "rce_field classad_attr format_fn"))
     RCAttribute("memory", "Memory", int),
     RCAttribute("allowed_vos", "AllowedVOs", _to_classad_list),
     RCAttribute("max_wall_time", "MaxWallTime", int),
-    # queue is special
+    RCAttribute("queue", "Queue", utilities.classad_quote),
     RCAttribute("subclusters", "Subclusters", _to_classad_list),
     RCAttribute("vo_tag", "VOTag", utilities.classad_quote),
     # extra_requirements is special
@@ -53,7 +53,7 @@ def __init__(self, **kwargs):
         self.memory = kwargs.get('memory', 0)
         self.allowed_vos = kwargs.get('allowed_vos', None)
         self.max_wall_time = kwargs.get('max_wall_time', None)
-        self.queue = kwargs.get('queue', '')
+        self.queue = kwargs.get('queue', None)
         self.subclusters = kwargs.get('subclusters', None)
         self.vo_tag = kwargs.get('vo_tag', None)
         self.extra_requirements = kwargs.get('extra_requirements', '')

tests/test_resourcecatalog.py

@@ -158,6 +158,7 @@ def testResourceEntry(self):
     MaxWallTime = 1440; \
     Memory = 4000; \
     Name = "red.unl.edu"; \
+    Queue = "red"; \
     Requirements = TARGET.RequestCPUs <= CPUs && TARGET.RequestMemory <= Memory && member(TARGET.VO, AllowedVOs) && TARGET.VOTag == "ANALYSIS"; \
     Transform = [ set_MaxMemory = RequestMemory; set_VOTag = "ANALYSIS"; set_remote_queue = "red"; set_xcount = RequestCPUs; ]; \
     VOTag = "ANALYSIS"; \
@@ -217,6 +218,7 @@ def testFullWithExtraTransforms(self):
     MaxWallTime = 1440; \
     Memory = 4000; \
     Name = "glow.chtc.wisc.edu"; \
+    Queue = "blue"; \
     Requirements = TARGET.RequestCPUs <= CPUs && TARGET.RequestMemory <= Memory && member(TARGET.VO, AllowedVOs); \
     Transform = [ set_MaxMemory = RequestMemory; set_WantRHEL6 = 1; set_remote_queue = "blue"; set_xcount = RequestCPUs; ]; \
   ] \
@@ -247,6 +249,7 @@ def testResourceEntryWithPilot(self):
     Memory = 2500; \
     Name = "glow.chtc.wisc.edu"; \
     OS = "rhel8"; \
+    Queue = ""; \
     RequireSingularity = True; \
     SendTests = True; \
     WholeNode = False; \
@@ -308,6 +311,7 @@ def testPilotExample(self):
     MaxWallTime = 2880; \
     Memory = 8192; \
     Name = "GPU"; \
+    Queue = "gpu_queue_name"; \
     RequireSingularity = True; \
     SendTests = True; \
     WholeNode = False; \