fix: removed set and get from CS

Author: fstagni

src/DIRAC/ResourceStatusSystem/Client/ResourceStatus.py

@@ -10,9 +10,7 @@
 from datetime import datetime, timedelta
 from time import sleep
 
-from DIRAC import S_ERROR, S_OK, gConfig, gLogger
-from DIRAC.ConfigurationSystem.Client.CSAPI import CSAPI
-from DIRAC.Core.Utilities import DErrno
+from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.Core.Utilities.DIRACSingleton import DIRACSingleton
 from DIRAC.ResourceStatusSystem.Client.ResourceStatusClient import ResourceStatusClient
 from DIRAC.ResourceStatusSystem.Utilities.InfoGetter import getPoliciesThatApply
@@ -36,13 +34,12 @@ def __init__(self):
 
         cacheLifeTime = int(self.rssConfig.getConfigCache())
 
-        # RSSCache only affects the calls directed to RSS, if using the CS it is not used.
+        # RSSCache only affects the calls directed to RSS
         self.rssCache = RSSCache(cacheLifeTime, self.__updateRssCache)
 
     def getElementStatus(self, elementName, elementType, statusType=None, default=None, vO=None):
         """
-        Helper function, tries to get information from the RSS for the given
-        Element, otherwise, it gets it from the CS.
+        Helper function, tries to get information from the RSS for the given Element
 
         :param elementName: name of the element or list of element names
         :type elementName: str, list
@@ -94,7 +91,7 @@ def getElementStatus(self, elementName, elementType, statusType=None, default=No
         return self.__getRSSElementStatus(elementName, elementType, statusType, vO)
 
     def setElementStatus(self, elementName, elementType, statusType, status, reason=None, tokenOwner=None):
-        """Tries set information in RSS and in CS.
+        """Tries set information in RSS
 
         :param elementName: name of the element
         :type elementName: str
@@ -169,50 +166,6 @@ def __getRSSElementStatus(self, elementName, elementType, statusType, vO):
 
         return cacheMatch
 
-    def __getCSElementStatus(self, elementName, elementType, statusType, default):
-        """Gets from the CS the Element status
-
-        :param elementName: name of the element
-        :type elementName: str
-        :param elementType: type of the element (StorageElement, ComputingElement, FTS)
-        :type elementType: str
-        :param statusType: type of the status (meaningful only when elementType==StorageElement)
-        :type statusType: str, list
-        :param default: defult value
-        :type default: None, str
-        """
-        cs_path = None
-        # DIRAC doesn't store the status of ComputingElements nor FTS in the CS, so here we can just return 'Active'
-        if elementType in ("ComputingElement", "FTS"):
-            return S_OK({elementName: {"all": "Active"}})
-
-        # If we are here it is because elementType is 'StorageElement'
-        if elementType == "StorageElement":
-            cs_path = "/Resources/StorageElements"
-
-        if not isinstance(elementName, list):
-            elementName = [elementName]
-
-        if not isinstance(statusType, list):
-            statusType = [statusType]
-
-        result = {}
-        for element in elementName:
-            for sType in statusType:
-                # Look in standard location, 'Active' by default
-                res = gConfig.getValue(f"{cs_path}/{element}/{sType}", "Active")
-                result.setdefault(element, {})[sType] = res
-
-        if result:
-            return S_OK(result)
-
-        if default is not None:
-            defList = [[el, statusType, default] for el in elementName]
-            return S_OK(getDictFromList(defList))
-
-        _msg = "Element '%s', with statusType '%s' is unknown for CS."
-        return S_ERROR(DErrno.ERESUNK, _msg % (elementName, statusType))
-
     def __setRSSElementStatus(self, elementName, elementType, statusType, status, reason, tokenOwner):
         """
         Sets on the RSS the Elements status
@@ -247,33 +200,6 @@ def __setRSSElementStatus(self, elementName, elementType, statusType, status, re
             # Release lock, no matter what.
             self.rssCache.releaseLock()
 
-    def __setCSElementStatus(self, elementName, elementType, statusType, status):
-        """
-        Sets on the CS the Elements status
-        """
-        cs_path = None
-        # DIRAC doesn't store the status of ComputingElements nor FTS in the CS, so here we can just do nothing
-        if elementType in ("ComputingElement", "FTS"):
-            return S_OK()
-
-        # If we are here it is because elementType is 'StorageElement'
-        statuses = self.rssConfig.getConfigStatusType(elementType)
-        if statusType not in statuses:
-            gLogger.error(f"{statusType} is not a valid statusType")
-            return S_ERROR(f"{statusType} is not a valid statusType: {statuses}")
-
-        if elementType == "StorageElement":
-            cs_path = "/Resources/StorageElements"
-
-        csAPI = CSAPI()
-        csAPI.setOption(f"{cs_path}/{elementName}/{elementType}/{statusType}", status)
-
-        res = csAPI.commitChanges()
-        if not res["OK"]:
-            gLogger.warn(f"CS: {res['Message']}")
-
-        return res
-
     def isStorageElementAlwaysBanned(self, seName, statusType):
         """Checks if the AlwaysBanned policy is applied to the SE given as parameter
 

src/DIRAC/ResourceStatusSystem/Client/SiteStatus.py

@@ -42,7 +42,7 @@ def __init__(self):
 
         cacheLifeTime = int(self.rssConfig.getConfigCache())
 
-        # RSSCache only affects the calls directed to RSS, if using the CS it is not used.
+        # RSSCache only affects the calls directed to RSS
         self.rssCache = RSSCache(cacheLifeTime, self.__updateRssCache)
 
     def __updateRssCache(self):