Policies: refactor policy package code to use new plugin code #6382

rucio · Mar 11, 2024 · 57955a0 · 57955a0
1 parent 5bb7ade
commit 57955a0
Show file tree

Hide file tree

Showing 5 changed files with 321 additions and 314 deletions.
diff --git a/lib/rucio/core/plugins.py → lib/rucio/common/plugins.py b/lib/rucio/core/plugins.py → lib/rucio/common/plugins.py
@@ -20,8 +20,6 @@
 
 from rucio.common import config
 from rucio.common.exception import InvalidAlgorithmName
-from rucio.common.utils import check_policy_package_version
-from rucio.core.vo import list_vos
 
 
 PolicyPackageAlgorithmsT = TypeVar('PolicyPackageAlgorithmsT', bound='PolicyPackageAlgorithms')
@@ -114,6 +112,7 @@ def _register_all_policy_package_algorithms(cls: Type[PolicyPackageAlgorithmsT])
                 cls._try_importing_policy(vo)
             # on server, list all VOs and register their algorithms
             else:
+                from rucio.core.vo import list_vos
                 # policy package per VO
                 vos = list_vos()
                 for vo in vos:
@@ -122,6 +121,9 @@ def _register_all_policy_package_algorithms(cls: Type[PolicyPackageAlgorithmsT])
     @classmethod
     def _try_importing_policy(cls: Type[PolicyPackageAlgorithmsT], vo: str = "") -> None:
         try:
+            # import from utils here to avoid circular import
+            from rucio.common.utils import check_policy_package_version
+
             env_name = 'RUCIO_POLICY_PACKAGE' + ('' if not vo else '_' + vo.upper())
             package = getattr(os.environ, env_name, "")
             if not package: