Modifying for use on non-OSPool HTCondor pools

__main__.py

@@ -113,6 +113,17 @@ def parse_cla() -> argparse.Namespace:
         + "should be a float between 0.0 (exclusive) and 1.0 (inclusive).",
     )
 
+    parser.add_argument(
+        "-cm",
+        "--central-manager",
+        metavar="cm.pool.domain",
+        dest="central_manager",
+        type=str,
+        default="cm-1.ospool.osg-htc.org",
+        help="Specifies the address of the HTCondor Central Manager."
+        + "Used for querying the resources available in the corresponding HTC pool."
+    )
+
     return parser.parse_args()
 
 

src/general.py

@@ -28,29 +28,44 @@
 import argparse
 from math import ceil
 
+def get_resource_classad(cm: str = "cm-1.ospool.osg-htc.org") -> str:
+    """
+    Usage: determine the classad to query the central manager for the resource names
+    @return: string of the classad of the desired resource name
+    """
+    if cm == "cm-1.ospool.osg-htc.org":
+        resource_classad: str = "GLIDEIN_ResourceName"
+    else:
+        resource_classad = "Machine"
+
+    return resource_classad
+
 
-def get_resources() -> dict:
+def get_resources(cm: str = "cm-1.ospool.osg-htc.org") -> dict:
     """
     Usage: query the collector for a list of resources currently in the OSPool
-    @return: dictionary whose keys are the names of all unique GLIDEIN_ResourceName s
-             currently visible in the OSPool
+    @return: dictionary whose keys are the names of all unique ResourceName s
+             currently visible in the HTCondor pool
     """
-    collector = htcondor2.Collector("cm-1.ospool.osg-htc.org")
+    collector = htcondor2.Collector(cm)
+
+    resource_classad: str = get_resource_classad(cm)
+
     resources = collector.query(
         ad_type=htcondor2.AdTypes.StartDaemon,
-        constraint="!isUndefined(GLIDEIN_ResourceName)",
-        projection=["GLIDEIN_ResourceName"],
+        constraint=f"!isUndefined({resource_classad})",
+        projection=[resource_classad],
     )
 
     unique_resources = dict()
 
     # eliminate repeat resources to produce a unique list
     # using a dictionary to count number of occurrences, but this count is unused at the moment
     for resource in resources:
-        if resource["GLIDEIN_ResourceName"] in unique_resources:
-            unique_resources[resource["GLIDEIN_ResourceName"]] += 1
+        if resource[resource_classad] in unique_resources:
+            unique_resources[resource[resource_classad]] += 1
         else:
-            unique_resources[resource["GLIDEIN_ResourceName"]] = 1
+            unique_resources[resource[resource_classad]] = 1
 
     return unique_resources
 
@@ -84,9 +99,9 @@ def run_exerciser(args: argparse.Namespace):
     # prints the list of currenlt available resources to the command line
     if args.snapshot:
         print("Here is a list of all currently available resources:")
-        resources = get_resources()
+        resources = get_resources(args.central_manager)
         for resource in resources.keys():
-            print(resource)
+            print(f'  {resource}')
         print("End of resource list")
         sys.exit(0)
 
@@ -95,7 +110,7 @@ def run_exerciser(args: argparse.Namespace):
     if args.print_tests:
         print("Here is a list of all tests in the test dir:")
         for test in tests_dir.iterdir():
-            print(test.name)
+            print(f'  {test.name}')
         print("End of test list")
         sys.exit(0)
 
@@ -118,7 +133,7 @@ def run_exerciser(args: argparse.Namespace):
     # -b option
     # controls whether the excersier runs. set to True by default
     if args.run:
-        execute_tests(tests_dir, working_dir, args.tests, args.resource_sample_size)
+        execute_tests(tests_dir, working_dir, args.tests, args.resource_sample_size, args.central_manager)
 
 
 def parse_date(date_from_cla: str) -> str:
@@ -155,7 +170,8 @@ def parse_date(date_from_cla: str) -> str:
     return format_date
 
 
-def execute_tests(tests_dir: Path, working_dir: Path, test_list: list, sample_percent: float):
+def execute_tests(tests_dir: Path, working_dir: Path, test_list: list, sample_percent: float,
+                  cm: str):
     """
     Usage: builds working file system and submits tests
     @param tests_dir: directory containing all exerciser tests
@@ -173,14 +189,16 @@ def execute_tests(tests_dir: Path, working_dir: Path, test_list: list, sample_pe
         with open(
             os.path.join(timestamp_dir, "resource_list.txt"), "w"
         ) as resource_list:
-            resources = get_resources()
+            resources = get_resources(cm)
             for resource in resources.keys():
                 resource_list.write(f"{resource}\n")
     else:
         # need to wait 1 min to allow for unique dir names
         print("Error: Please wait at least 1 minute between succesive runs")
         sys.exit(1)
 
+    resource_classad: str = get_resource_classad(cm)
+
     # where the magic happens!
     # loop through every test returned by iter_tests, create execution dirs for them using
     # create_test_execute_dir, prepare them with generate_sub_object, and then submit them to the
@@ -195,7 +213,7 @@ def execute_tests(tests_dir: Path, working_dir: Path, test_list: list, sample_pe
         schedd = htcondor2.Schedd()
 
         os.chdir(execute_dir)
-        job = generate_sub_object(sub_file, test.name, abs_timestamp_dir)
+        job = generate_sub_object(sub_file, test.name, abs_timestamp_dir, resource_classad)
 
         item_data = []
         for resource in resources.keys():
@@ -289,7 +307,10 @@ def create_test_execute_dir(timestamp_dir: Path, test_dir: Path) -> tuple:
     return (execute_dir, sub_file)
 
 
-def generate_sub_object(sub_file: Path, test_name: str, timestamp_dir: str) -> htcondor2.Submit:
+def generate_sub_object(
+        sub_file: Path, test_name: str, timestamp_dir: str, 
+        resource_classad: str = "GLIDEIN_ResourceName"
+        ) -> htcondor2.Submit:
     """
     Usage: create an htcondor Submit object based on sub_file targetted to resource
     @param sub_file: general submit file to parse through to create Submit object
@@ -307,7 +328,7 @@ def generate_sub_object(sub_file: Path, test_name: str, timestamp_dir: str) -> h
     job.setSubmitMethod(99, True)
 
     # add requirement to land on target ResourceName
-    req_expr = 'TARGET.GLIDEIN_ResourceName == "$(ResourceName)"'
+    req_expr = f'TARGET.{resource_classad} == "$(ResourceName)"'
     req = job.get("Requirements")
     job["Requirements"] = req_expr if req is None else req_expr + f" && ({req})"
 
@@ -331,7 +352,7 @@ def generate_sub_object(sub_file: Path, test_name: str, timestamp_dir: str) -> h
     job["submit_event_notes"] = f"exerciser_info:{test_name},$(ResourceName),$(SampleNumber)"
 
     # add execute attributes
-    job["ulog_execute_attrs"] = "GLIDEIN_ResourceName"
+    job["ulog_execute_attrs"] = resource_classad
 
     # add pool exerciser identifier attributes
     job["My.EXERCISER_Job"] = "true"

tests/basic-cpu/basic-cpu.sub

@@ -0,0 +1,15 @@
+# Simple submit file for testing the pool exerciser on the CHTC
+
+executable = /bin/hostname
+transfer_executable = False
+arguments = -f
+
+output = $(sample_dir)/basic-cpu.out
+error = $(sample_dir)/basic-cpu.err
+log = basic-cpu.log
+
+request_cpus = 1
+request_memory = 1GB
+request_disk = 1GB
+
+queue