feat: removed Catalogs from list of managed RSS resources

Author: fstagni

src/DIRAC/ResourceStatusSystem/Client/ResourceStatus.py

@@ -1,4 +1,4 @@
-""" ResourceStatus
+"""ResourceStatus
 
 Module that acts as a helper for knowing the status of a resource.
 It takes care of switching between the CS and the RSS.
@@ -46,7 +46,7 @@ def getElementStatus(self, elementName, elementType, statusType=None, default=No
 
         :param elementName: name of the element or list of element names
         :type elementName: str, list
-        :param elementType: type of the element (StorageElement, ComputingElement, FTS, Catalog)
+        :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: None, str, list
@@ -65,8 +65,6 @@ def getElementStatus(self, elementName, elementType, statusType=None, default=No
             S_ERROR( xyz.. )
         >>> getElementStatus('ThisIsAWrongName', 'StorageElement', 'WriteAccess')
             S_ERROR( xyz.. )
-        >>> getElementStatus('A_file_catalog', 'FileCatalog')
-            S_OK( { 'A_file_catalog': { 'all': 'Active' } } } )
         >>> getElementStatus('SE1', 'StorageElement', ['ReadAccess', 'WriteAccess'])
             S_OK( { 'SE1': { 'ReadAccess': 'Banned' , 'WriteAccess': 'Active'} } } )
         >>> getElementStatus('SE1', 'StorageElement')
@@ -79,7 +77,7 @@ def getElementStatus(self, elementName, elementType, statusType=None, default=No
                    'CE2': {'all': 'Probing'}}}
         """
 
-        allowedParameters = ["StorageElement", "ComputingElement", "FTS", "Catalog"]
+        allowedParameters = ["StorageElement", "ComputingElement", "FTS"]
 
         if elementType not in allowedParameters:
             return S_ERROR(f"{elementType} in not in the list of the allowed parameters: {allowedParameters}")
@@ -92,8 +90,6 @@ def getElementStatus(self, elementName, elementType, statusType=None, default=No
                 statusType = ["all"]
             elif elementType == "FTS":
                 statusType = ["all"]
-            elif elementType == "Catalog":
-                statusType = ["all"]
 
         return self.__getRSSElementStatus(elementName, elementType, statusType, vO)
 
@@ -102,7 +98,7 @@ def setElementStatus(self, elementName, elementType, statusType, status, reason=
 
         :param elementName: name of the element
         :type elementName: str
-        :param elementType: type of the element (StorageElement, ComputingElement, FTS, Catalog)
+        :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
@@ -159,7 +155,7 @@ def __getRSSElementStatus(self, elementName, elementType, statusType, vO):
 
         :param elementName: name of the element or list of element names
         :type elementName: str, list
-        :param elementType: type of the element (StorageElement, ComputingElement, FTS, Catalog)
+        :param elementType: type of the element (StorageElement, ComputingElement, FTS)
         :type elementType: str
         :param statusType: type of the status (meaningful only when elementType==StorageElement,
                            otherwise it is 'all' or ['all'])
@@ -178,7 +174,7 @@ def __getCSElementStatus(self, elementName, elementType, statusType, default):
 
         :param elementName: name of the element
         :type elementName: str
-        :param elementType: type of the element (StorageElement, ComputingElement, FTS, Catalog)
+        :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
@@ -190,12 +186,9 @@ def __getCSElementStatus(self, elementName, elementType, statusType, default):
         if elementType in ("ComputingElement", "FTS"):
             return S_OK({elementName: {"all": "Active"}})
 
-        # If we are here it is because elementType is either 'StorageElement' or 'Catalog'
+        # If we are here it is because elementType is 'StorageElement'
         if elementType == "StorageElement":
             cs_path = "/Resources/StorageElements"
-        elif elementType == "Catalog":
-            cs_path = "/Resources/FileCatalogs"
-            statusType = ["Status"]
 
         if not isinstance(elementName, list):
             elementName = [elementName]
@@ -263,19 +256,14 @@ def __setCSElementStatus(self, elementName, elementType, statusType, status):
         if elementType in ("ComputingElement", "FTS"):
             return S_OK()
 
-        # If we are here it is because elementType is either 'StorageElement' or 'Catalog'
+        # 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"
-        elif elementType == "Catalog":
-            cs_path = "/Resources/FileCatalogs"
-            # FIXME: This a probably outdated location (new one is in /Operations/[]/Services/Catalogs)
-            # but needs to be VO-aware
-            statusType = "Status"
 
         csAPI = CSAPI()
         csAPI.setOption(f"{cs_path}/{elementName}/{elementType}/{statusType}", status)

src/DIRAC/ResourceStatusSystem/Utilities/Synchronizer.py

@@ -136,7 +136,7 @@ def _syncSites(self):
     def _syncResources(self):
         """
         Sync resources: compares CS with DB and does the necessary modifications.
-        ( StorageElements, FTS, FileCatalogs and ComputingElements )
+        (StorageElements, FTS and ComputingElements)
         """
 
         gLogger.info("-- Synchronizing Resources --")
@@ -151,11 +151,6 @@ def _syncResources(self):
         if not fts["OK"]:
             gLogger.error(fts["Message"])
 
-        gLogger.verbose("-> FileCatalogs")
-        fileCatalogs = self.__syncFileCatalogs()
-        if not fileCatalogs["OK"]:
-            gLogger.error(fileCatalogs["Message"])
-
         gLogger.verbose("-> ComputingElements")
         computingElements = self.__syncComputingElements()
         if not computingElements["OK"]:
@@ -278,75 +273,6 @@ def __syncComputingElements(self):
 
         return S_OK()
 
-    def __syncFileCatalogs(self):
-        """
-        Sync FileCatalogs: compares CS with DB and does the necessary modifications.
-        """
-
-        catalogsCS = CSHelpers.getFileCatalogs()
-        if not catalogsCS["OK"]:
-            return catalogsCS
-        catalogsCS = catalogsCS["Value"]
-
-        gLogger.verbose(f"{len(catalogsCS)} File catalogs found in CS")
-
-        catalogsDB = self.rStatus.selectStatusElement(
-            "Resource", "Status", elementType="Catalog", meta={"columns": ["Name"]}
-        )
-        if not catalogsDB["OK"]:
-            return catalogsDB
-        catalogsDB = [catalogDB[0] for catalogDB in catalogsDB["Value"]]
-
-        # StorageElements that are in DB but not in CS
-        toBeDeleted = list(set(catalogsDB).difference(set(catalogsCS)))
-        gLogger.verbose(f"{len(toBeDeleted)} File catalogs to be deleted")
-
-        # Delete storage elements
-        for catalogName in toBeDeleted:
-            deleteQuery = self.rStatus._extermineStatusElement("Resource", catalogName)
-
-            gLogger.verbose(f"... {catalogName}")
-            if not deleteQuery["OK"]:
-                return deleteQuery
-
-        # statusTypes = RssConfiguration.getValidStatusTypes()[ 'Resource' ]
-        statusTypes = self.rssConfig.getConfigStatusType("Catalog")
-
-        result = self.rStatus.selectStatusElement(
-            "Resource", "Status", elementType="Catalog", meta={"columns": ["Name", "StatusType"]}
-        )
-        if not result["OK"]:
-            return result
-        sesTuple = [(x[0], x[1]) for x in result["Value"]]
-
-        # For each ( se, statusType ) tuple not present in the DB, add it.
-        catalogsStatusTuples = [(se, statusType) for se in catalogsCS for statusType in statusTypes]
-        toBeAdded = list(set(catalogsStatusTuples).difference(set(sesTuple)))
-
-        gLogger.verbose(f"{len(toBeAdded)} File catalogs entries to be added")
-
-        for catalogTuple in toBeAdded:
-            _name = catalogTuple[0]
-            _statusType = catalogTuple[1]
-            _status = self.defaultStatus
-            _reason = "Synchronized"
-            _elementType = "Catalog"
-
-            query = self.rStatus.addIfNotThereStatusElement(
-                "Resource",
-                "Status",
-                name=_name,
-                statusType=_statusType,
-                status=_status,
-                elementType=_elementType,
-                tokenOwner=self.tokenOwner,
-                reason=_reason,
-            )
-            if not query["OK"]:
-                return query
-
-        return S_OK()
-
     def __syncFTS(self):
         """
         Sync FTS: compares CS with DB and does the necessary modifications.