DIRAC 9.0.0a42__py3-none-any.whl → 9.0.7__py3-none-any.whl

DIRAC/ProductionSystem/scripts/dirac_prod_get_trans.py

@@ -16,14 +16,13 @@ def main():
     Script.registerArgument("prodID: Production ID")
     _, args = Script.parseCommandLine()
 
+    from DIRAC.MonitoringSystem.Client.WebAppClient import WebAppClient
     from DIRAC.ProductionSystem.Client.ProductionClient import ProductionClient
-    from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
 
     # get arguments
     prodID = args[0]
 
     prodClient = ProductionClient()
-    transClient = TransformationClient()
 
     res = prodClient.getProductionTransformations(prodID)
     transIDs = []
@@ -70,7 +69,7 @@ def main():
     ]
     resList = []
 
-    res = transClient.getTransformationSummaryWeb({"TransformationID": transIDs}, [], 0, len(transIDs))
+    res = WebAppClient().getTransformationSummaryWeb({"TransformationID": transIDs}, [], 0, len(transIDs))
 
     if not res["OK"]:
         DIRAC.gLogger.error(res["Message"])

DIRAC/RequestManagementSystem/Agent/RequestExecutingAgent.py

@@ -48,13 +48,13 @@ from DIRAC.RequestManagementSystem.private.RequestTask import RequestTask
 # # agent name
 AGENT_NAME = "RequestManagement/RequestExecutingAgent"
 # # requests/cycle
-REQUESTSPERCYCLE = 100
+REQUESTSPERCYCLE = 300
 # # minimal nb of subprocess running
-MINPROCESS = 20
+MINPROCESS = 50
 # # maximal nb of subprocess executed same time
-MAXPROCESS = 20
+MAXPROCESS = 50
 # # ProcessPool queue size
-QUEUESIZE = 20
+QUEUESIZE = 100
 # # file timeout
 FILETIMEOUT = 300
 # # operation timeout
@@ -62,7 +62,9 @@ OPERATIONTIMEOUT = 300
 # # ProcessPool finalization timeout
 POOLTIMEOUT = 900
 # # ProcessPool sleep time
-POOLSLEEP = 5
+POOLSLEEP = 1
+# # Fetch multiple requests at once from the DB. Otherwise, one by one
+BULKREQUEST = 300
 
 
 class AgentConfigError(Exception):
@@ -108,7 +110,7 @@ class RequestExecutingAgent(AgentModule):
         self.__poolSleep = POOLSLEEP
         self.__requestClient = None
         # Size of the bulk if use of getRequests. If 0, use getRequest
-        self.__bulkRequest = 0
+        self.__bulkRequest = BULKREQUEST
         self.__rmsMonitoring = False
 
     def processPool(self):

DIRAC/RequestManagementSystem/Agent/RequestOperations/ForwardDISET.py

@@ -1,17 +1,5 @@
-""" :mod: ForwardDISET
-
-    ==================
-
-    .. module: ForwardDISET
-
-    :synopsis: DISET forwarding operation handler
-
-    .. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
-
-    DISET forwarding operation handler
-"""
-
 import importlib
+from collections.abc import Sequence
 
 # imports
 from DIRAC import S_ERROR, S_OK, gConfig
@@ -65,7 +53,7 @@ class ForwardDISET(OperationHandlerBase):
             return S_ERROR(str(error))
 
         # This is the DISET rpcStub
-        if isinstance(stub, tuple):
+        if isinstance(stub, Sequence):
             # Ensure the forwarded request is done on behalf of the request owner
             res = getDNForUsername(self.request.Owner)
             if not res["OK"]:

DIRAC/RequestManagementSystem/Client/ReqClient.py

@@ -6,25 +6,28 @@
 
 """
 
+import datetime
+import json
 import os
-import time
 import random
-import json
-import datetime
+import time
+from functools import cached_property
 
 # # from DIRAC
-from DIRAC import gLogger, S_OK, S_ERROR
-from DIRAC.Core.Utilities.List import randomize, fromChar
-from DIRAC.Core.Utilities.JEncode import strToIntDict
-from DIRAC.Core.Utilities.DEncode import ignoreEncodeWarning
+from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.ConfigurationSystem.Client import PathFinder
 from DIRAC.Core.Base.Client import Client, createClient
+from DIRAC.Core.Utilities.DEncode import ignoreEncodeWarning
+from DIRAC.Core.Utilities.JEncode import strToIntDict
+from DIRAC.Core.Utilities.List import fromChar, randomize
+from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
+from DIRAC.Core.Utilities.ReturnValues import returnValueOrRaise
 from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.RequestManagementSystem.private.RequestValidator import RequestValidator
-from DIRAC.WorkloadManagementSystem.Client import JobStatus
-from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus
-from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient
+from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus, JobStatus
 from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
+from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient
+from DIRAC.WorkloadManagementSystem.Utilities.JobStatusUtility import JobStatusUtility
 
 
 @createClient("RequestManagement/ReqManager")
@@ -309,8 +312,7 @@ class ReqClient(Client):
         :param str requestID: request id
         :param int jobID: job id
         """
-
-        stateServer = JobStateUpdateClient(useCertificates=useCertificates)
+        stateServer = _JobDBInteraction(useCertificates)
 
         # Checking if to update the job status - we should fail here, so it will be re-tried later
         # Checking the state, first
@@ -632,8 +634,10 @@ def printOperation(indexOperation, verbose=True, onlyFailed=False):
             output = ""
             prettyPrint(decode, offset=10)
             prStr += "\n      Arguments:\n" + output.strip("\n")
-        else:
+        elif isinstance(decode, list):
             prStr += f"\n      Service: {decode[0][0]}"
+        else:
+            prStr += f"\n      Command: {decode['dCls']}.{decode['dMeth']}(*{decode['args']!r})"
     gLogger.always(
         "  [%s] Operation Type='%s' ID=%s Order=%s Status='%s'%s%s"
         % (
@@ -688,3 +692,52 @@ def recoverableRequest(request):
                         return False
                     return True
     return True
+
+
+class _JobDBInteraction:
+    """Class to handle the JobDB interaction.
+
+    This will either connect to the DB directly or use the client depending on
+    if use_certificates is set or not.
+
+    WARNING: This is not intended for use outside of ReqClient!
+    """
+
+    def __init__(self, useCertificates: bool):
+        self._useCertificates = useCertificates
+
+    def setJobParameter(self, jobID: int, key: str, value: str):
+        if self._useCertificates:
+            vo = returnValueOrRaise(self._jobStatusUtility.jobDB.getJobAttribute(jobID, "VO"))
+            return self._elasticJobParametersDB.setJobParameter(int(jobID), key, value, vo=vo)
+        else:
+            return self._client.setJobParameter(jobID, key, value)
+
+    def setJobStatus(self, jobID: int, newStatus: str, minorStatus: str, source: str):
+        if self._useCertificates:
+            return self._jobStatusUtility.setJobStatus(
+                int(jobID), status=newStatus, minorStatus=minorStatus, source=source
+            )
+        else:
+            return self._client.setJobStatus(jobID, newStatus, minorStatus, source)
+
+    def setJobApplicationStatus(self, jobID: int, appStatus: str, source: str):
+        if self._useCertificates:
+            return self._jobStatusUtility.setJobStatus(int(jobID), appStatus=appStatus, source=source)
+        else:
+            return self._client.setJobApplicationStatus(jobID, appStatus, source)
+
+    @cached_property
+    def _client(self):
+        return JobStateUpdateClient(useCertificates=False)
+
+    @cached_property
+    def _jobStatusUtility(self):
+        return JobStatusUtility()
+
+    @cached_property
+    def _elasticJobParametersDB(self):
+        result = ObjectLoader().loadObject("WorkloadManagementSystem.DB.JobParametersDB", "JobParametersDB")
+        if not result["OK"]:
+            return result
+        return result["Value"]()

DIRAC/RequestManagementSystem/ConfigTemplate.cfg

@@ -44,19 +44,19 @@ Agents
   {
     PollingTime = 60
     # number of Requests to execute per cycle
-    RequestsPerCycle = 100
+    RequestsPerCycle = 300
     # minimum number of workers process in the ProcessPool
-    MinProcess = 20
+    MinProcess = 50
     # maximum number of workers process in the ProcessPool; recommended to set it to the same value as MinProcess
-    MaxProcess = 20
+    MaxProcess = 50
     # queue depth of the ProcessPool
-    ProcessPoolQueueSize = 20
+    ProcessPoolQueueSize = 100
     # timeout for the ProcessPool finalization
     ProcessPoolTimeout = 900
     # sleep time before retrying to get a free slot in the ProcessPool
-    ProcessPoolSleep = 5
+    ProcessPoolSleep = 1
     # If a positive integer n is given, we fetch n requests at once from the DB. Otherwise, one by one
-    BulkRequest = 0
+    BulkRequest = 300
     OperationHandlers
     {
       ForwardDISET

DIRAC/RequestManagementSystem/DB/RequestDB.py

@@ -16,6 +16,8 @@ import datetime
 import errno
 import random
 
+from urllib.parse import quote_plus
+
 from sqlalchemy import (
     TEXT,
     BigInteger,
@@ -198,7 +200,7 @@ class RequestDB:
         self.dbHost = dbParameters["Host"]
         self.dbPort = dbParameters["Port"]
         self.dbUser = dbParameters["User"]
-        self.dbPass = dbParameters["Password"]
+        self.dbPass = quote_plus(dbParameters["Password"])
         self.dbName = dbParameters["DBName"]
 
     def __init__(self, parentLogger=None):
@@ -435,10 +437,13 @@ class RequestDB:
             # FIXME: code for backward compatibility
             if not request.Owner:
                 # We go under the assumption that in this case OwnerDN exists
-                res = getDNForUsername(request.OwnerDN)
-                if not res["OK"]:
-                    return res
-                request.Owner = res["Value"][0]
+                if request.OwnerDN:
+                    res = getDNForUsername(request.OwnerDN)
+                    if not res["OK"]:
+                        return res
+                    request.Owner = res["Value"][0]
+                else:
+                    request.Owner = "Unknown"
             # ##
 
             return S_OK(request)

DIRAC/RequestManagementSystem/DB/test/RMSTestScenari.py

@@ -6,6 +6,7 @@ integration tests (Test_ReqDB.py)
 # pylint: disable=invalid-name,wrong-import-position
 import time
 
+import pytest
 
 from DIRAC.RequestManagementSystem.Client.Request import Request
 from DIRAC.RequestManagementSystem.Client.Operation import Operation
@@ -42,6 +43,7 @@ def test_stress(reqDB):
         assert delete["OK"], delete
 
 
+@pytest.mark.slow
 def test_stressBulk(reqDB):
     """stress test bulk"""
 

DIRAC/RequestManagementSystem/private/RequestValidator.py

@@ -1,49 +1,49 @@
-""" :mod: RequestValidator
+""":mod: RequestValidator
 
-    ======================
+======================
 
-    .. module: RequestValidator
+.. module: RequestValidator
 
-    :synopsis: request validator
+:synopsis: request validator
 
-    .. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
+.. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
 
-    A general and simple request validator checking for required attributes and logic.
-    It checks if required attributes are set/unset but not for their values.
+A general and simple request validator checking for required attributes and logic.
+It checks if required attributes are set/unset but not for their values.
 
-    RequestValidator class implements the DIRACSingleton pattern, no global object is
-    required to keep a single instance.
+RequestValidator class implements the DIRACSingleton pattern, no global object is
+required to keep a single instance.
 
-    If you need to extend this one with your own specific checks consider:
+If you need to extend this one with your own specific checks consider:
 
-      * for adding Operation or Files required attributes use :any:`addReqAttrsCheck` function::
+  * for adding Operation or Files required attributes use :any:`addReqAttrsCheck` function::
 
-          RequestValidator().addReqAttrsCheck( "FooOperation", operationAttrs = [ "Bar", "Buzz"], filesAttrs = [ "LFN" ] )
+      RequestValidator().addReqAttrsCheck( "FooOperation", operationAttrs = [ "Bar", "Buzz"], filesAttrs = [ "LFN" ] )
 
-      * for adding generic check define a new callable object ( function or functor ) which takes only one argument,
-        say for functor::
+  * for adding generic check define a new callable object ( function or functor ) which takes only one argument,
+    say for functor::
 
-          class MyValidator( RequestValidator ):
+      class MyValidator( RequestValidator ):
 
-            @staticmethod
-            def hasFoo( request ):
-              if not request.Foo:
-                return S_ERROR("Foo not set")
-              return S_OK()
+        @staticmethod
+        def hasFoo( request ):
+          if not request.Foo:
+            return S_ERROR("Foo not set")
+          return S_OK()
 
-      * or function::
+  * or function::
 
-          def hasBar( request ):
-            if not request.Bar:
-              return S_ERROR("Bar not set")
-            return S_OK()
+      def hasBar( request ):
+        if not request.Bar:
+          return S_ERROR("Bar not set")
+        return S_OK()
 
-    and add this one to the validators set by calling `RequestValidator().addValidator`, i.e.::
+and add this one to the validators set by calling `RequestValidator().addValidator`, i.e.::
 
-      RequestValidator().addValidator( MyValidator.hasFoo )
-      RequestValidator().addValidator( hasFoo )
+  RequestValidator().addValidator( MyValidator.hasFoo )
+  RequestValidator().addValidator( hasFoo )
 
-    Notice that all validators should always return S_ERROR/S_OK, no exceptions from that whatsoever!
+Notice that all validators should always return S_ERROR/S_OK, no exceptions from that whatsoever!
 """
 
 import inspect
@@ -53,6 +53,7 @@ from DIRAC import S_OK, S_ERROR, gConfig, gLogger
 from DIRAC.Core.Security.Properties import FULL_DELEGATION, LIMITED_DELEGATION
 from DIRAC.Core.Utilities.DIRACSingleton import DIRACSingleton
 from DIRAC.ConfigurationSystem.Client import PathFinder
+from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getUsernameForDN
 
 
 class RequestValidator(metaclass=DIRACSingleton):
@@ -268,28 +269,21 @@ class RequestValidator(metaclass=DIRACSingleton):
 
         :returns: True if everything is fine, False otherwise
         """
-
         credUserName = remoteCredentials["username"]
         credGroup = remoteCredentials["group"]
         credProperties = remoteCredentials["properties"]
-        ownershipCheck = None
-
-        # FIXME: code for backward compatibility with requests created by 8.0 clients
-        # The below can be clearly simplified, leaving the extended checks for clarity
-        if hasattr(request, "OwnerDN") and not hasattr(
-            request, "Owner"
-        ):  # Requests created by v8.0 client for v8.0 servers
-            ownershipCheck = request.OwnerDN
-        if not hasattr(request, "OwnerDN") and hasattr(
-            request, "Owner"
-        ):  # Requests created by v9 client for v9 servers
-            ownershipCheck = request.Owner
-        if hasattr(request, "OwnerDN") and hasattr(request, "Owner"):  # Requests created by v8.0 client for v9 servers
-            ownershipCheck = request.Owner
-        # ##
+
+        # In case we have an old style request with only a DN and no Owner,
+        # get the Owner from the DN.
+        if getattr(request, "OwnerDN", None) and not getattr(request, "Owner", None):
+            res = getUsernameForDN(request.OwnerDN)
+            if not res["OK"]:
+                gLogger.error("Cannot Validate request", res)
+                return False
+            request.Owner = res["Value"]
 
         # If the owner or the group was not set, we use the one of the credentials
-        if not ownershipCheck or not request.OwnerGroup:
+        if not request.Owner or not request.OwnerGroup:
             request.Owner = credUserName
             request.OwnerGroup = credGroup
             return True

DIRAC/ResourceStatusSystem/Client/SiteStatus.py

@@ -1,4 +1,4 @@
-""" SiteStatus helper
+"""SiteStatus helper
 
 Module that acts as a helper for knowing the status of a site.
 It takes care of switching between the CS and the RSS.
@@ -195,7 +195,7 @@ class SiteStatus(metaclass=DIRACSingleton):
 
         return S_OK(siteList)
 
-    def setSiteStatus(self, site, status, comment="No comment"):
+    def setSiteStatus(self, site, status, comment="No comment", expiry=None):
         """
         Set the status of a site in the 'SiteStatus' table of RSS
 
@@ -231,6 +231,8 @@ class SiteStatus(metaclass=DIRACSingleton):
             return S_ERROR(f"Unable to get user proxy info {result['Message']} ")
 
         tokenExpiration = datetime.utcnow() + timedelta(days=1)
+        if expiry:
+            tokenExpiration = expiry
 
         self.rssCache.acquireLock()
         try:

DIRAC/ResourceStatusSystem/Command/FreeDiskSpaceCommand.py

@@ -121,7 +121,9 @@ class FreeDiskSpaceCommand(Command):
             "Site": siteRes["Value"] if siteRes["Value"] else "unassigned",
         }
 
-        results["Used"] = results["Total"] - results["Free"]
+        # There are sometimes small discrepencies which can lead to negative
+        # used values.
+        results["Used"] = max(0, results["Total"] - results["Free"])
 
         for sType in ["Total", "Free", "Used"]:
             spaceTokenAccounting = StorageOccupancy()

DIRAC/ResourceStatusSystem/DB/ResourceManagementDB.py

@@ -45,7 +45,7 @@ class AccountingCache(rmsBase):
     """AccountingCache table"""
 
     __tablename__ = "AccountingCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     name = Column("Name", String(64), nullable=False, primary_key=True)
     plotname = Column("PlotName", String(64), nullable=False, primary_key=True)
@@ -88,7 +88,7 @@ class DowntimeCache(rmsBase):
     """DowntimeCache table"""
 
     __tablename__ = "DowntimeCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     downtimeid = Column("DowntimeID", String(127), nullable=False, primary_key=True)
     name = Column("Name", String(64), nullable=False)
@@ -150,7 +150,7 @@ class GGUSTicketsCache(rmsBase):
     """GGUSTicketsCache table"""
 
     __tablename__ = "GGUSTicketsCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     gocsite = Column("GocSite", String(64), nullable=False, primary_key=True)
     tickets = Column("Tickets", String(1024), nullable=False)
@@ -186,7 +186,7 @@ class JobCache(rmsBase):
     """JobCache table"""
 
     __tablename__ = "JobCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     site = Column("Site", String(64), nullable=False, primary_key=True)
     status = Column("Status", String(16), nullable=False)
@@ -219,7 +219,7 @@ class PilotCache(rmsBase):
     """PilotCache table"""
 
     __tablename__ = "PilotCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     site = Column("Site", String(64), nullable=False, primary_key=True)
     ce = Column("CE", String(64), nullable=False, primary_key=True)
@@ -261,7 +261,7 @@ class PolicyResult(rmsBase):
     """PolicyResult table"""
 
     __tablename__ = "PolicyResult"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     policyname = Column("PolicyName", String(64), nullable=False, primary_key=True)
     statustype = Column("StatusType", String(16), nullable=False, server_default="", primary_key=True)
@@ -320,7 +320,7 @@ class SpaceTokenOccupancyCache(rmsBase):
     """SpaceTokenOccupancyCache table"""
 
     __tablename__ = "SpaceTokenOccupancyCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     endpoint = Column("Endpoint", String(128), nullable=False, primary_key=True)
     token = Column("Token", String(64), nullable=False, primary_key=True)
@@ -358,7 +358,7 @@ class TransferCache(rmsBase):
     """TransferCache table"""
 
     __tablename__ = "TransferCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     sourcename = Column("SourceName", String(64), nullable=False, primary_key=True)
     destinationname = Column("DestinationName", String(64), nullable=False, primary_key=True)

DIRAC/ResourceStatusSystem/DB/ResourceStatusDB.py

@@ -50,7 +50,7 @@ class ResourceStatusCache(rssBase):
     """
 
     __tablename__ = "ResourceStatusCache"
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     id = Column("ID", BigInteger, nullable=False, autoincrement=True, primary_key=True)
     sitename = Column("SiteName", String(64), nullable=False)
@@ -89,7 +89,7 @@ class ElementStatusBase:
     Prototype for tables.
     """
 
-    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8"}
+    __table_args__ = {"mysql_engine": "InnoDB", "mysql_charset": "utf8mb4"}
 
     name = Column("Name", String(64), nullable=False, primary_key=True)
     statustype = Column("StatusType", String(128), nullable=False, server_default="all", primary_key=True)

DIRAC/ResourceStatusSystem/Utilities/CSHelpers.py

@@ -3,11 +3,10 @@ Module containing functions interacting with the CS and useful for the RSS
 modules.
 """
 
-from DIRAC import gConfig, gLogger, S_OK
+from DIRAC import S_OK, gConfig, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueues
 from DIRAC.Core.Utilities.SiteSEMapping import getSEParameters
-from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getQueues, getCESiteMapping
 from DIRAC.DataManagementSystem.Utilities.DMSHelpers import DMSHelpers
-from DIRAC.ResourceStatusSystem.Utilities import Utils
 
 
 def warmUp():
@@ -19,28 +18,6 @@ def warmUp():
     gRefresher.refreshConfigurationIfNeeded()
 
 
-def getResources():
-    """
-    Gets all resources
-    """
-
-    resources = DMSHelpers().getStorageElements()
-
-    fts = getFTS()
-    if fts["OK"]:
-        resources = resources + fts["Value"]
-
-    fc = getFileCatalogs()
-    if fc["OK"]:
-        resources = resources + fc["Value"]
-
-    res = getCESiteMapping()
-    if res["OK"]:
-        resources = resources + list(res["Value"])
-
-    return S_OK(resources)
-
-
 def getStorageElementEndpoint(seName):
     """Get endpoints of a StorageElement
 
@@ -86,12 +63,6 @@ def getFTS():
     return S_OK([])
 
 
-def getSpaceTokenEndpoints():
-    """Get Space Token Endpoints"""
-
-    return Utils.getCSTree("Shares/Disk")
-
-
 def getFileCatalogs():
     """
     Gets all storage elements from /Resources/FileCatalogs