refactor: commands read args directly from self.args without hardcoded defaults

FreeDiskSpaceCommand and DowntimeCommand no longer duplicate default values
in .get() fallbacks — defaults live exclusively in POLICIESMETA and are
guaranteed to be present in self.args by the time the command runs.

Author: fstagni

docs/source/DeveloperGuide/Systems/ResourceStatus/index.rst

@@ -115,7 +115,7 @@ Cache tables for metrics used by policies.
    * - PolicyResult
      - Policy evaluation results (Element, Name, PolicyName, Status, Reason)
    * - SpaceTokenOccupancyCache
-      - Storage space usage (Endpoint, Token, Free, Total) — values stored in MB
+     - Storage space usage (Endpoint, Token, Free, Total) — values stored in MB
    * - TransferCache
      - Transfer quality metrics (SourceName, DestinationName, Metric, Value)
 

src/DIRAC/ResourceStatusSystem/Command/DowntimeCommand.py

@@ -4,11 +4,11 @@
 Downtimes found are stored in the DowntimeCache table via ResourceManagementClient.
 Stale or deleted GOCDB downtimes are also removed from the cache.
 
-The look-ahead window is controlled by the ``hours`` argument (read from ``self.args``,
-populated from ``/Operations/Defaults/ResourceStatus/Policies/Downtime/hours``):
+The look-ahead window is controlled by the ``hours`` argument read from ``self.args``,
+populated by the policy engine from ``POLICIESMETA`` defaults and any CS overrides:
 
-* ``hours = 0`` (default) — only ongoing downtimes are considered.
-* ``hours > 0``            — downtimes starting within the next ``hours`` hours are also included.
+* ``hours = 0`` — only ongoing downtimes are considered.
+* ``hours > 0`` — downtimes starting within the next ``hours`` hours are also included.
 
 """
 
@@ -144,7 +144,7 @@ def _prepareCommand(self):
 
         Optional key:
 
-        * ``hours`` (int) — look-ahead window in hours (default: ``None`` = ongoing only).
+        * ``hours`` (int) — look-ahead window in hours (populated from ``POLICIESMETA``).
 
         Name resolution:
 
@@ -172,9 +172,7 @@ def _prepareCommand(self):
         if element not in ["Site", "Resource"]:
             return S_ERROR("element is neither Site nor Resource")
 
-        hours = None
-        if "hours" in self.args:
-            hours = self.args["hours"]
+        hours = self.args.get("hours")
 
         gOCDBServiceType = None
 

src/DIRAC/ResourceStatusSystem/Command/FreeDiskSpaceCommand.py

@@ -2,12 +2,12 @@
 
 Command to retrieve and cache the free/total disk space of a Storage Element.
 
-The unit and decision thresholds are read from ``self.args`` (populated from the
-Operations CS ``/Operations/Defaults/ResourceStatus/Policies/FreeDiskSpace``):
+The unit and decision thresholds are read from ``self.args``, which are populated
+by the policy engine from ``POLICIESMETA`` defaults and any CS overrides:
 
-* ``unit``               — space unit for the occupancy query: ``TB`` (default), ``GB`` or ``MB``
-* ``Banned_threshold``   — free-space value below which the SE is Banned (default: 0.1)
-* ``Degraded_threshold`` — free-space value below which the SE is Degraded (default: 5)
+* ``unit``               — space unit for the occupancy query (``TB``, ``GB`` or ``MB``)
+* ``Banned_threshold``   — free-space value below which the SE is Banned
+* ``Degraded_threshold`` — free-space value below which the SE is Degraded
 
 Note: there are still many references to "space tokens" (e.g.
 ``ResourceManagementClient().selectSpaceTokenOccupancyCache(token=elementName)``).
@@ -52,11 +52,11 @@ def _prepareCommand(self):
 
         * ``name`` (str) — Storage Element name.
 
-        Optional keys (all read from the FreeDiskSpace policy configuration):
+        Optional keys (populated from ``POLICIESMETA`` defaults and CS overrides):
 
-        * ``unit`` (str)               — space unit: ``TB`` (default), ``GB`` or ``MB``.
-        * ``Banned_threshold`` (float) — free space below which the SE is Banned (default: 0.1).
-        * ``Degraded_threshold`` (float) — free space below which the SE is Degraded (default: 5).
+        * ``unit`` (str)                 — space unit: ``TB``, ``GB`` or ``MB``.
+        * ``Banned_threshold`` (float)   — free space below which the SE is Banned.
+        * ``Degraded_threshold`` (float) — free space below which the SE is Degraded.
 
         :returns: S_OK tuple ``(elementName, unit, banned_threshold, degraded_threshold)``
             or S_ERROR if ``name`` is missing.
@@ -66,10 +66,9 @@ def _prepareCommand(self):
             return S_ERROR('"name" not found in self.args')
         elementName = self.args["name"]
 
-        unit = self.args.get("unit", "TB")
-
-        banned_threshold = self.args.get("Banned_threshold", 0.1)
-        degraded_threshold = self.args.get("Degraded_threshold", 5)
+        unit = self.args["unit"]
+        banned_threshold = self.args["Banned_threshold"]
+        degraded_threshold = self.args["Degraded_threshold"]
 
         return S_OK((elementName, unit, banned_threshold, degraded_threshold))
 
@@ -91,8 +90,8 @@ def doNew(self, masterParams=None):
 
         if masterParams is not None:
             elementName, unit = masterParams
-            banned_threshold = self.args.get("Banned_threshold", 0.1)
-            degraded_threshold = self.args.get("Degraded_threshold", 5)
+            banned_threshold = self.args["Banned_threshold"]
+            degraded_threshold = self.args["Degraded_threshold"]
         else:
             params = self._prepareCommand()
             if not params["OK"]:

src/DIRAC/ResourceStatusSystem/Policy/FreeDiskSpacePolicy.py

@@ -28,7 +28,7 @@ def _evaluate(commandResult):
 
         :param dict commandResult: S_OK / S_ERROR result from FreeDiskSpaceCommand.
             On success the value is expected to be a dict with keys:
-            ``Free``, ``Total``, ``Banned_threshold`` (optional), ``Degraded_threshold`` (optional).
+            ``Free``, ``Total``, ``Banned_threshold``, ``Degraded_threshold``.
 
         :returns: S_OK wrapping a dict ``{'Status': str, 'Reason': str}`` where Status is one of
             ``Error``, ``Unknown``, ``Banned``, ``Degraded``, ``Active``.
@@ -58,10 +58,10 @@ def _evaluate(commandResult):
 
         # Units (TB, GB, MB) may change,
         # depending on the configuration of the command in Configurations.py
-        if free < commandResult.get("Banned_threshold", 0.1):
+        if free < commandResult["Banned_threshold"]:  # default: 0.1
             result["Status"] = "Banned"
             result["Reason"] = "Too little free space"
-        elif free < commandResult.get("Degraded_threshold", 5):
+        elif free < commandResult["Degraded_threshold"]:  # default: 5
             result["Status"] = "Degraded"
             result["Reason"] = "Little free space"
         else:

src/DIRAC/ResourceStatusSystem/Policy/test/Test_RSS_Policy_FreeDiskSpacePolicy.py

@@ -1,5 +1,4 @@
-""" Test_RSS_Policy_FreeDiskSpacePolicy
-"""
+"""Test_RSS_Policy_FreeDiskSpacePolicy"""
 # pylint: disable=protected-access
 
 import unittest
@@ -72,17 +71,29 @@ def test_evaluate(self):
         self.assertEqual("Error", res["Value"]["Status"])
         self.assertEqual("Key Free missing", res["Value"]["Reason"])
 
-        res = module._evaluate({"OK": True, "Value": {"Total": 100, "Free": 0.0}})
+        res = module._evaluate(
+            {"OK": True, "Value": {"Total": 100, "Free": 0.0, "Banned_threshold": 0.1, "Degraded_threshold": 5}}
+        )
         self.assertTrue(res["OK"])
         self.assertEqual("Banned", res["Value"]["Status"])
         self.assertEqual("Too little free space", res["Value"]["Reason"])
 
-        res = module._evaluate({"OK": True, "Value": {"Total": 100, "Free": 4.0, "Guaranteed": 1}})
+        res = module._evaluate(
+            {
+                "OK": True,
+                "Value": {"Total": 100, "Free": 4.0, "Guaranteed": 1, "Banned_threshold": 0.1, "Degraded_threshold": 5},
+            }
+        )
         self.assertTrue(res["OK"])
         self.assertEqual("Degraded", res["Value"]["Status"])
         self.assertEqual("Little free space", res["Value"]["Reason"])
 
-        res = module._evaluate({"OK": True, "Value": {"Total": 100, "Free": 100, "Guaranteed": 1}})
+        res = module._evaluate(
+            {
+                "OK": True,
+                "Value": {"Total": 100, "Free": 100, "Guaranteed": 1, "Banned_threshold": 0.1, "Degraded_threshold": 5},
+            }
+        )
         self.assertTrue(res["OK"])
         self.assertEqual("Active", res["Value"]["Status"])
         self.assertEqual("Enough free space", res["Value"]["Reason"])

src/DIRAC/ResourceStatusSystem/Utilities/InfoGetter.py

@@ -285,9 +285,6 @@ def postProcessingPolicyList(policiesThatApply):
     element, we keep only the most specific one. Specificity is determined by the number
     of ``matchParams`` keys: more keys = more specific. If one of the duplicates matched
     by ``name`` it is always considered more specific than one that did not.
-
-    This replaces the old per-type hacks (``FreeDiskSpaceMB`` > ``FreeDiskSpaceGB`` >
-    ``FreeDiskSpaceTB``) with a generic rule that works for any policy type.
     """
     from collections import defaultdict