fix: Changed to make the legacy adaptor automatic.

Author: Robin VAN DE MERGHEL

integration_tests.py

@@ -163,10 +163,9 @@ def create(
     run_server_tests: bool = True,
     run_client_tests: bool = True,
     run_pilot_tests: bool = True,
-    legacy_adapted_services: Optional[list[str]] = typer.Option(None, help="Services that have legacy adaptors."),
 ):
     """Start a local instance of the integration tests"""
-    prepare_environment(flags, editable, extra_module, diracx_dist_dir, release_var, legacy_adapted_services)
+    prepare_environment(flags, editable, extra_module, diracx_dist_dir, release_var)
     install_server()
     install_client()
     install_pilot()
@@ -216,7 +215,6 @@ def prepare_environment(
     extra_module: Optional[list[str]] = None,
     diracx_dist_dir: Optional[str] = None,
     release_var: Optional[str] = None,
-    legacy_adapted_services: Optional[list[str]] = typer.Option(None, help="Services that have legacy adaptors."),
 ):
     """Prepare the local environment for installing DIRAC."""
     if extra_module is None:
@@ -238,11 +236,7 @@ def prepare_environment(
     else:
         flags = dict(f.split("=", 1) for f in flags)
 
-    legacy_adapted_services_str = ""
-    if legacy_adapted_services:
-        legacy_adapted_services_str = " ".join(legacy_adapted_services)
-
-    docker_compose_env = _make_env(flags, legacy_adapted_services_str)
+    docker_compose_env = _make_env(flags)
 
     server_flags = {}
     client_flags = {}
@@ -715,7 +709,7 @@ def _find_dirac_release():
         return version_branch
 
 
-def _make_env(flags, legacy_adapted_services=""):
+def _make_env(flags):
     # Important note: when you add an env variable here to pass it to
     # a docker compose, make sure that in docker-compose.yml, you added an
     # `environment` field for your service.
@@ -736,7 +730,6 @@ def _make_env(flags, legacy_adapted_services=""):
     if "CVMFS_DIR" not in env or not Path(env["CVMFS_DIR"]).is_dir():
         typer.secho(f"CVMFS_DIR environment value: {env.get('CVMFS_DIR', 'NOT SET')}", fg=c.YELLOW)
         env["CVMFS_DIR"] = "/tmp"
-    env["LEGACY_ADAPTED_SERVICES"] = legacy_adapted_services
     return env
 
 

src/DIRAC/Core/Utilities/Extensions.py

@@ -73,6 +73,15 @@ def findServices(modules):
     return findModules(modules, "Service", "*Handler")
 
 
+def findFutureServices(modules):
+    """Find the legacy adapted services for one or more DIRAC extension(s)
+
+    :param list/str/module module: One or more Python modules or Python module names
+    :returns: list of tuples of the form (SystemName, ServiceName)
+    """
+    return findModules(modules, "FutureClient")
+
+
 @iterateThenSort
 def findDatabases(module):
     """Find the DB SQL schema defintions for one or more DIRAC extension(s)
@@ -182,7 +191,7 @@ def parseArgs():
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers(required=True, dest="function")
     defaultExtensions = extensionsByPriority()
-    for func in [findSystems, findAgents, findExecutors, findServices, findDatabases]:
+    for func in [findSystems, findAgents, findExecutors, findServices, findDatabases, findFutureServices]:
         subparser = subparsers.add_parser(func.__name__)
         subparser.add_argument("--extensions", nargs="+", default=defaultExtensions)
         subparser.set_defaults(func=func)

src/DIRAC/WorkloadManagementSystem/Client/JobMonitoringClient.py

@@ -18,7 +18,8 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.setServer("WorkloadManagement/JobMonitoring")
 
-    diracxClient = futureJobMonitoringClient
+    # Removed to avoid using it in ClientSelector
+    # diracxClient = futureJobMonitoringClient
 
     @ignoreEncodeWarning
     def getJobsStatus(self, jobIDs):

tests/CI/docker-compose.yml

@@ -151,7 +151,6 @@ services:
     environment:
       - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo
       - DIRACX_SERVICE_AUTH_TOKEN_KEYSTORE=file:///keystore/jwks.json
-      - LEGACY_ADAPTED_SERVICES
     command: ["sleep", "infinity"] # This is necessary because of the issue described in https://github.com/moby/moby/issues/42275. What is added here is a hack/workaround.
     pull_policy: always
 

tests/Jenkins/dirac-cfg-setup-diracx.py

@@ -78,7 +78,7 @@ def main(url: str, disabled_vos: list[str], legacy_adapted_services: list[str]):
     for service in legacy_adapted_services:
         print(f"Adding legacy adaptor for service {service}")
         # Service name such as:  system/name
-        system, name = service.split("/")
+        system, name = service.split(" ")
 
         if not system in legacy["LegacyClientEnabled"]:
             legacy["LegacyClientEnabled"][system] = {}

tests/Jenkins/dirac_ci.sh

@@ -167,11 +167,15 @@ installSite() {
   else
     diracxSetupArgs+=("--disable-vo" "vo")
   fi
-  if [[ -n "${LEGACY_ADAPTED_SERVICES:-}" ]]; then
-    # Add legacy adaptor
-    # Format : --legacy-adapted-services serviceA serviceB ...
-    diracxSetupArgs+=("--legacy-adapted-services" ${LEGACY_ADAPTED_SERVICES})
+
+  # Call findFutureServices and read services into an array
+  mapfile -t futureServices < <(python -m DIRAC.Core.Utilities.Extensions findFutureServices)
+
+  # If there are any services, add them to the args
+  if [[ ${#futureServices[@]} -gt 0 ]]; then
+    diracxSetupArgs+=(--legacy-adapted-services "${futureServices[@]}")
   fi
+
   if ! python "${TESTCODE}/DIRAC/tests/Jenkins/dirac-cfg-setup-diracx.py" "${diracxSetupArgs[@]}"; then
     echo "ERROR: dirac-cfg-setup-diracx.py failed" >&2
     exit 1