change: use defaults for StatusTypes

Author: fstagni

docs/source/AdministratorGuide/Systems/ResourceStatus/configuration.rst

@@ -12,9 +12,6 @@ preferably on Defaults subsection. ::
                               State       = Active
                               Cache       = 720
                               FromAddress = email@address
-                              /StatusTypes
-                                  default = all
-                                  StorageElement = ReadAccess,WriteAccess,CheckAccess,RemoveAccess
 
 .. _config section :
 
@@ -27,4 +24,3 @@ This section is all you need to get the RSS working. The parameters are the foll
 :State: < Active || InActive ( default if not specified ) > is the flag used on the ResourceStatus helper to switch between CS and RSS. If Active, RSS is used.
 :Cache: < <int> || 300 ( default if not specified ) > [ seconds ] sets the lifetime for the cached information on RSSCache.
 :FromAddress: < <string> || ( default dirac mail address ) > email used t osend the emails from ( sometimes a valid email address is needed ).
-:StatusTypes: if a ElementType has more than one StatusType ( aka StorageElement ), we have to specify them here, Otherwise, "all" is taken as StatusType.

docs/source/AdministratorGuide/Systems/ResourceStatus/install.rst

@@ -21,9 +21,6 @@ Please, make sure you have the following schema::
     /Operations/Defaults/ResourceStatus
       /Config
         Cache        = 300
-        /StatusTypes
-            default = all
-            StorageElement = ReadAccess,WriteAccess,CheckAccess,RemoveAccess
 
 For a more detailed explanation, take a look to the official documentation:
 :ref:`rss-configuration`.

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

@@ -544,9 +544,6 @@ Policies
 Actions
    ``/Operations/Defaults/ResourceStatus/PolicyActions``
 
-Status Types
-   ``/Operations/Defaults/ResourceStatus/Config/StatusTypes``
-
 Services
    ``/Systems/ResourceStatus/Services/``
 

src/DIRAC/ResourceStatusSystem/Utilities/RSSCacheNoThread.py

@@ -1,4 +1,4 @@
-""" Cache
+"""Cache
 
 This module provides a generic Cache extended to be used on RSS, RSSCache.
 This cache features a lazy update method. It will only be updated if it is
@@ -7,6 +7,7 @@
 After that, the cache is empty.
 
 """
+
 import itertools
 import random
 
@@ -215,7 +216,7 @@ def __init__(self, lifeTime, updateFunc):
 
         super().__init__(lifeTime, updateFunc)
 
-        self.allStatusTypes = RssConfiguration().getConfigStatusType()
+        self.allStatusTypes = ["All"]
 
     def match(self, elementNames, elementType, statusTypes, vO):
         """

src/DIRAC/ResourceStatusSystem/Utilities/RssConfiguration.py

@@ -6,7 +6,6 @@
 """
 
 from DIRAC import S_OK
-from DIRAC.Core.Utilities import List
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.ResourceStatusSystem.PolicySystem.StateMachine import RSSMachine
 from DIRAC.ResourceStatusSystem.Utilities import Utils
@@ -51,25 +50,6 @@ def getConfigFromAddress(self, default=None):
 
         return self.opsHelper.getValue(f"{_rssConfigPath}/Config/FromAddress", default)
 
-    def getConfigStatusType(self, elementType=None):
-        """
-        Gets all the status types per elementType, if not given, it takes default
-        from CS. If not, hardcoded variable DEFAULT.
-        """
-
-        _DEFAULTS = ("all",)
-
-        res = self.opsHelper.getOptionsDict(f"{_rssConfigPath}/Config/StatusTypes")
-
-        if res["OK"]:
-            if elementType in res["Value"]:
-                return List.fromChar(res["Value"][elementType])
-
-            if "default" in res["Value"]:
-                return List.fromChar(res["Value"]["default"])
-
-        return _DEFAULTS
-
 
 def getPolicies():
     """

src/DIRAC/ResourceStatusSystem/Utilities/Synchronizer.py

@@ -235,9 +235,6 @@ def __syncComputingElements(self):
             if not deleteQuery["OK"]:
                 return deleteQuery
 
-        # statusTypes = RssConfiguration.getValidStatusTypes()[ 'Resource' ]
-        statusTypes = self.rssConfig.getConfigStatusType("ComputingElement")
-
         result = self.rStatus.selectStatusElement(
             "Resource", "Status", elementType="ComputingElement", meta={"columns": ["Name", "StatusType"]}
         )
@@ -246,7 +243,7 @@ def __syncComputingElements(self):
         cesTuple = [(x[0], x[1]) for x in result["Value"]]
 
         # For each ( se, statusType ) tuple not present in the DB, add it.
-        cesStatusTuples = [(se, statusType) for se in cesCS for statusType in statusTypes]
+        cesStatusTuples = [(se, "All") for se in cesCS]
         toBeAdded = list(set(cesStatusTuples).difference(set(cesTuple)))
 
         gLogger.debug(f"{len(toBeAdded)} Computing elements entries to be added")
@@ -302,9 +299,6 @@ def __syncFTS(self):
             if not deleteQuery["OK"]:
                 return deleteQuery
 
-        statusTypes = self.rssConfig.getConfigStatusType("FTS")
-        # statusTypes = RssConfiguration.getValidStatusTypes()[ 'Resource' ]
-
         result = self.rStatus.selectStatusElement(
             "Resource", "Status", elementType="FTS", meta={"columns": ["Name", "StatusType"]}
         )
@@ -313,7 +307,7 @@ def __syncFTS(self):
         sesTuple = [(x[0], x[1]) for x in result["Value"]]
 
         # For each ( se, statusType ) tuple not present in the DB, add it.
-        ftsStatusTuples = [(se, statusType) for se in ftsCS for statusType in statusTypes]
+        ftsStatusTuples = [(se, "All") for se in ftsCS]
         toBeAdded = list(set(ftsStatusTuples).difference(set(sesTuple)))
 
         gLogger.verbose(f"{len(toBeAdded)} FTS endpoints entries to be added")
@@ -368,9 +362,6 @@ def __syncStorageElements(self):
             if not deleteQuery["OK"]:
                 return deleteQuery
 
-        statusTypes = self.rssConfig.getConfigStatusType("StorageElement")
-        # statusTypes = RssConfiguration.getValidStatusTypes()[ 'Resource' ]
-
         result = self.rStatus.selectStatusElement(
             "Resource", "Status", elementType="StorageElement", meta={"columns": ["Name", "StatusType"]}
         )
@@ -379,7 +370,11 @@ def __syncStorageElements(self):
         sesTuple = [(x[0], x[1]) for x in result["Value"]]
 
         # For each ( se, statusType ) tuple not present in the DB, add it.
-        sesStatusTuples = [(se, statusType) for se in sesCS for statusType in statusTypes]
+        sesStatusTuples = [
+            (se, statusType)
+            for se in sesCS
+            for statusType in ["ReadAccess", "WriteAccess", "CheckAccess", "RemoveAccess"]
+        ]
         toBeAdded = list(set(sesStatusTuples).difference(set(sesTuple)))
 
         gLogger.verbose(f"{len(toBeAdded)} storage element entries to be added")

src/DIRAC/ResourceStatusSystem/scripts/dirac_rss_query_db.py

@@ -9,7 +9,6 @@
 from DIRAC import S_OK
 from DIRAC import exit as DIRACExit
 from DIRAC import gLogger
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.Core.Base.Script import Script
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
 from DIRAC.Core.Utilities import TimeUtilities
@@ -126,29 +125,6 @@ def getToken(key):
         return expirationDate
 
 
-def checkStatusTypes(statusTypes):
-    """
-    To check if values for 'statusType' are valid
-    """
-
-    opsH = Operations().getValue(
-        "ResourceStatus/Config/StatusTypes/StorageElement", "ReadAccess,WriteAccess,CheckAccess,RemoveAccess"
-    )
-    acceptableStatusTypes = opsH.replace(",", "").split()
-
-    for statusType in statusTypes:
-        if statusType not in acceptableStatusTypes and statusType != "all":
-            acceptableStatusTypes.append("all")
-            error(
-                "'%s' is a wrong value for switch 'statusType'.\n\tThe acceptable values are:\n\t%s"
-                % (statusType, str(acceptableStatusTypes))
-            )
-
-    if "all" in statusType:
-        return acceptableStatusTypes
-    return statusTypes
-
-
 def unpack(switchDict):
     """
     To split and process comma-separated list of values for 'name' and 'statusType'
@@ -163,7 +139,6 @@ def unpack(switchDict):
 
     if switchDict["statusType"] is not None:
         statusTypes = list(filter(None, switchDict["statusType"].split(",")))
-        statusTypes = checkStatusTypes(statusTypes)
 
     if names and statusTypes:
         combinations = [(a, b) for a in names for b in statusTypes]

src/DIRAC/ResourceStatusSystem/scripts/dirac_rss_set_status.py

@@ -9,7 +9,6 @@
 
 from DIRAC import S_OK, gLogger
 from DIRAC import exit as DIRACExit
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.Core.Base.Script import Script
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
 from DIRAC.ResourceStatusSystem.Client import ResourceStatusClient
@@ -78,27 +77,6 @@ def parseSwitches():
     return switches
 
 
-def checkStatusTypes(statusTypes):
-    """
-    To check if values for 'statusType' are valid
-    """
-
-    opsH = Operations().getValue("ResourceStatus/Config/StatusTypes/StorageElement")
-    acceptableStatusTypes = opsH.replace(",", "").split()
-
-    for statusType in statusTypes:
-        if statusType not in acceptableStatusTypes and statusType != "all":
-            acceptableStatusTypes.append("all")
-            gLogger.error(
-                "'%s' is a wrong value for switch 'statusType'.\n\tThe acceptable values are:\n\t%s"
-                % (statusType, str(acceptableStatusTypes))
-            )
-
-    if "all" in statusType:
-        return acceptableStatusTypes
-    return statusTypes
-
-
 def unpack(switchDict):
     """
     To split and process comma-separated list of values for 'name' and 'statusType'
@@ -113,7 +91,6 @@ def unpack(switchDict):
 
     if switchDict["statusType"] is not None:
         statusTypes = list(filter(None, switchDict["statusType"].split(",")))
-        statusTypes = checkStatusTypes(statusTypes)
 
     if len(names) > 0 and len(statusTypes) > 0:
         combinations = [(a, b) for a in names for b in statusTypes]

src/DIRAC/ResourceStatusSystem/scripts/dirac_rss_sync.py

@@ -124,7 +124,7 @@ def initSEs():
     from DIRAC.DataManagementSystem.Utilities.DMSHelpers import DMSHelpers
     from DIRAC.ResourceStatusSystem.Client import ResourceStatusClient
     from DIRAC.ResourceStatusSystem.PolicySystem import StateMachine
-    from DIRAC.ResourceStatusSystem.Utilities import CSHelpers, RssConfiguration
+    from DIRAC.ResourceStatusSystem.Utilities import CSHelpers
 
     # WarmUp local copy
     CSHelpers.warmUp()
@@ -134,7 +134,7 @@ def initSEs():
     rssClient = ResourceStatusClient.ResourceStatusClient()
 
     statuses = StateMachine.RSSMachine(None).getStates()
-    statusTypes = RssConfiguration.RssConfiguration().getConfigStatusType("StorageElement")
+    statusTypes = ["ReadAccess", "WriteAccess", "RemoveAccess", "CheckAccess"]
     reason = "dirac-rss-sync"
 
     gLogger.debug(statuses)

tests/Jenkins/dirac-cfg-update-server.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 """update local cfg"""
+
 import os
 import sys
 
@@ -304,14 +305,6 @@
 #         State = Active
 #         FromAddress = [email protected]
 #         notificationGroups = ShiftersGroup
-#         StatusTypes
-#         {
-#           default = all
-#           StorageElement = ReadAccess
-#           StorageElement += WriteAccess
-#           StorageElement += CheckAccess
-#           StorageElement += RemoveAccess
-#         }
 #       }
 #       Policies
 #       {
@@ -361,15 +354,6 @@
 csAPI.setOption("Operations/Defaults/ResourceStatus/Config/Cache", "600")
 csAPI.setOption("Operations/Defaults/ResourceStatus/Config/FromAddress", "[email protected]")
 csAPI.setOption("Operations/Defaults/ResourceStatus/Config/notificationGroups", "ShiftersGroup")
-res = csAPI.createSection("Operations/Defaults/ResourceStatus/Config/StatusTypes")
-if not res["OK"]:
-    print(res["Message"])
-    sys.exit(1)
-csAPI.setOption("Operations/Defaults/ResourceStatus/Config/StatusTypes/default", "all")
-csAPI.setOption(
-    "Operations/Defaults/ResourceStatus/Config/StatusTypes/StorageElement",
-    "ReadAccess,WriteAccess,CheckAccess,RemoveAccess",
-)
 
 res = csAPI.createSection("Operations/Defaults/ResourceStatus/Policies")
 if not res["OK"]: