Merge pull request #633 from htcondor/V24_x-HTCONDOR-2688-fix-tests

HTCONDOR-2688 fix-tests

Author: JaimeFrey

Diff for: src/htcondorce/web.py

@@ -22,6 +22,8 @@
 _view = None
 _plugins = []
 OK_STATUS = '200 OK'
+_jinja_env = None
+multice = None
 
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
@@ -90,7 +92,6 @@ def validate_plugin(name, plugin):
 def check_initialized(environ):
     global _initialized
     global _jinja_env
-    global _cp
     global _plugins
     global htcondor
     global multice

Diff for: src/verify_ce_config.py

@@ -8,8 +8,6 @@
 import re
 import sys
 
-from collections import defaultdict
-
 
 def error(msg):
     """Exit with error 'msg'
@@ -29,30 +27,8 @@ def debug(msg):
     print("DEBUG: " + msg)
 
 
-def parse_route_names(entries_config):
-    """Return names of job routes that can be parsed as proper ClassAds
-    """
-    try:
-        return [x['Name'] for x in classad.parseAds(entries_config)]
-    except KeyError:
-        error("Name is a required field for all entries in JOB_ROUTER_ENTRIES")
-
-
-def find_malformed_entries(entries_config):
-    """Find all unparseable router entries based on the raw JOB_ROUTER_ENTRIES configuration
-    """
-    unparsed_names = [x.replace('"', '')
-                      for x in re.findall(r'''name\s*=\s*["'](\w+)["']''',
-                                          entries_config,
-                                          re.IGNORECASE)]
-    parsed_names = parse_route_names(entries_config)
-
-    return set(unparsed_names) - set(parsed_names)
-
-
 # Verify that the HTCondor Python bindings are in the PYTHONPATH
 try:
-    import classad2 as classad
     import htcondor2 as htcondor
 except ImportError:
     error("Could not load HTCondor Python bindings. "
@@ -65,7 +41,6 @@ def main():
     is_osg = htcondor.param.get('OSG_CONFIGURE_PRESENT', '').lower() in ('true', 'yes', '1')
 
     # Create dict whose values are lists of ads specified in the relevant JOB_ROUTER_* variables
-    parsed_jr_ads = defaultdict(list)
     jr_transforms = {key : value for key, value in htcondor.param.items() if key.startswith("JOB_ROUTER_ROUTE_")}
 
     # If JOB_ROUTER_ROUTE_<name> rules are defined, verify that these transforms exist
@@ -76,86 +51,6 @@ def main():
             if not route_def:
                 warn(f"The route {name} is specified in JOB_ROUTER_ROUTE_NAMES, but no corresponding JOB_ROUTER_ROUTE_{name} exists")
 
-    # If no JOB_ROUTER_ROUTE_<name> rules exist, verify JOB_ROUTER_DEFAULTS and JOB_ROUTER_ENTRIES
-    else:
-        used_deprecated_knobs = []
-        for knob in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES', 'JOB_ROUTER_ENTRIES_CMD','JOB_ROUTER_ENTRIES_FILE']:
-            if knob in htcondor.param:
-                used_deprecated_knobs.append(knob)
-        if len(used_deprecated_knobs) > 0:
-            warn(f"{', '.join(used_deprecated_knobs)} are deprecated and will be removed for V24 of the HTCondor Software Suite. New configuration"
-                 + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For example"
-                 + " use of new syntax visit:\nhttps://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration\n\n"
-                 + "   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n")
-
-        for attr in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES']:
-            try:
-                config_val = htcondor.param[attr]
-            except KeyError:
-                error("Missing %s configuration value. " % attr)
-                continue
-
-            # store the ads (iterating through ClassAdStringIterator consumes them)
-            if attr != "JOB_ROUTER_ENTRIES":
-                try:
-                    parsed_jr_ads[attr] = list(classad.parseAds(config_val))
-                except ValueError:
-                    # We shouldn't ever get here since classad.parseAds() only raises ValueError when it's given
-                    # non-string/non-file output and htcondor.param shouldn't contain such values
-                    debug("Failed to parse %s configuration value. " % attr)
-
-                    # If JRD or JRE can't be parsed, the job router can't function
-                    if not parsed_jr_ads[attr]:
-                        debug("Could not read %s in the HTCondor-CE configuration. " % attr)
-
-            if attr == "JOB_ROUTER_ENTRIES":
-                # Warn about routes we can find in the config that don't result in valid ads
-                malformed_entry_names = find_malformed_entries(config_val)
-                if malformed_entry_names:
-                    warn("Could not read JOB_ROUTER_ENTRIES in the HTCondor-CE configuration. " +
-                        "Failed to parse the following routes: %s"
-                        % ', '.join(malformed_entry_names))
-
-                # Warn about routes specified by JOB_ROUTER_ROUTE_NAMES that don't appear in the parsed JRE.
-                # The job router can function this way but it's likely a config error
-                route_order = htcondor.param.get('JOB_ROUTER_ROUTE_NAMES', '')
-                if route_order:
-                    missing_route_def = set(route_order.replace(',',' ').split()).difference(set(parse_route_names(config_val)))
-                    if missing_route_def:
-                        warn("The following are specified in JOB_ROUTER_ROUTE_NAMES "
-                            "but cannot be found in JOB_ROUTER_ENTRIES: %s"
-                            % ', '.join(missing_route_def))
-
-        # Find all eval_set_ attributes in the JOB_ROUTER_DEFAULTS
-        eval_set_defaults = set([x.lstrip('eval_') for x in parsed_jr_ads['JOB_ROUTER_DEFAULTS'][0].keys()
-                                if x.startswith('eval_set_')])
-
-        # Find all default_ attributes used in expressions in the JOB_ROUTER_DEFAULTS
-        default_attr = set([re.sub(r'.*(default_\w*).*', 'eval_set_\\1', str(x))
-                        for x in parsed_jr_ads['JOB_ROUTER_DEFAULTS'][0].values()
-                        if isinstance(x, classad.ExprTree) and "default_" in str(x)])
-
-        for entry in parsed_jr_ads['JOB_ROUTER_ENTRIES']:
-            # Warn users if they've set_ attributes that would be overriden by eval_set in the JOB_ROUTER_DEFAULTS
-            overriden_attr = eval_set_defaults.intersection(set(entry.keys()))
-            if overriden_attr:
-                warn("%s in JOB_ROUTER_ENTRIES will be overriden by the JOB_ROUTER_DEFAULTS."
-                    % ', '.join(overriden_attr)
-                    + " Use the 'eval_set_' prefix instead.")
-
-            # Ensure that users don't set the job environment in the Job Router
-            if is_osg and any(x.endswith('environment') for x in entry.keys()):
-                warn("Do not use the Job Router to set the environment. See documentation for more details: "
-                    + "https://htcondor.github.io/htcondor-ce/v5/configuration/writing-job-routes/#setting-job-environments")
-
-            # Warn users about eval_set_ default attributes in the ENTRIES since their
-            # evaluation may occur after the eval_set_ expressions containg them in the
-            # JOB_ROUTER_DEFAULTS
-            no_effect_attr = default_attr.intersection(set([x for x in entry.keys() if x.startswith('eval_set_')]))
-            if no_effect_attr:
-                warn("%s in JOB_ROUTER_ENTRIES " % ', '.join(no_effect_attr)
-                    + "may not have any effect. Use the 'set_' prefix instead.")
-
     # Warn users on OSG CEs if osg-configure has not been run
     if is_osg:
         try: