Merge pull request #5925 from fstagni/80_fixes19

[8.0] added TornadoWMSAdministratorHandler

Author: fstagni

docs/source/AdministratorGuide/ServerInstallations/scalingAndLimitations.rst

@@ -142,7 +142,7 @@ Services
 +                    +---------------------------------------------------------------------------------------------------+-------------+---------------------------------------------------------------------------+-----------+
 |                    | :mod:`SandboxStore <DIRAC.WorkloadManagementSystem.Service.SandboxStoreHandler>`                  |             |                                                                           |           +
 +                    +---------------------------------------------------------------------------------------------------+-------------+---------------------------------------------------------------------------+-----------+
-|                    | :mod:`WMSAdministrator <DIRAC.WorkloadManagementSystem.Service.WMSAdministratorHandler>`          | YES         |                                                                           |           +
+|                    | :mod:`WMSAdministrator <DIRAC.WorkloadManagementSystem.Service.WMSAdministratorHandler>`          | YES         |                                                                           | YES       +
 +--------------------+---------------------------------------------------------------------------------------------------+-------------+---------------------------------------------------------------------------+-----------+
 
 

src/DIRAC/WorkloadManagementSystem/ConfigTemplate.cfg

@@ -78,6 +78,22 @@ Services
       banSite += Operator
     }
   }
+  TornadoWMSAdministrator
+  {
+    Protocol = https
+    Authorization
+    {
+      Default = Operator
+      getJobPilotOutput = authenticated
+      getSiteMask = authenticated
+      getSiteMaskStatus = authenticated
+      ping = authenticated
+      allowSite = SiteManager
+      allowSite += Operator
+      banSite = SiteManager
+      banSite += Operator
+    }
+  }
   #Parameters of the Pilots service
   PilotManager
   {

src/DIRAC/WorkloadManagementSystem/Service/JobMonitoringHandler.py

@@ -3,7 +3,6 @@
 
     The following methods are available in the Service interface
 """
-from datetime import timedelta
 
 from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.DISET.RequestHandler import RequestHandler

src/DIRAC/WorkloadManagementSystem/Service/TornadoWMSAdministratorHandler.py

@@ -0,0 +1,12 @@
+""" Tornado-based HTTPs WMSAdministrator service.
+"""
+from DIRAC import gLogger
+from DIRAC.Core.Tornado.Server.TornadoService import TornadoService
+from DIRAC.WorkloadManagementSystem.Service.WMSAdministratorHandler import WMSAdministratorHandlerMixin
+
+
+sLog = gLogger.getSubLogger(__name__)
+
+
+class TornadoWMSAdministratorHandler(WMSAdministratorHandlerMixin, TornadoService):
+    log = sLog

src/DIRAC/WorkloadManagementSystem/Service/WMSAdministratorHandler.py

@@ -10,7 +10,7 @@
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
 
 
-class WMSAdministratorHandler(RequestHandler):
+class WMSAdministratorHandlerMixin:
     @classmethod
     def initializeHandler(cls, svcInfoDict):
         """WMS AdministratorService initialization"""
@@ -20,7 +20,7 @@ def initializeHandler(cls, svcInfoDict):
                 return result
             cls.jobDB = result["Value"]()
         except RuntimeError as excp:
-            return S_ERROR("Can't connect to DB: %s" % excp)
+            return S_ERROR(f"Can't connect to DB: {excp!r}")
 
         cls.elasticJobParametersDB = None
         useESForJobParametersFlag = Operations().getValue("/Services/JobMonitoring/useESForJobParametersFlag", False)
@@ -33,7 +33,7 @@ def initializeHandler(cls, svcInfoDict):
                     return result
                 cls.elasticJobParametersDB = result["Value"]()
             except RuntimeError as excp:
-                return S_ERROR("Can't connect to DB: %s" % excp)
+                return S_ERROR(f"Can't connect to DB: {excp!r}")
 
         cls.pilotManager = PilotManagerClient()
 
@@ -260,3 +260,7 @@ def export_getSiteSummarySelectors(cls):
         resultDict["Site"] = siteList
 
         return S_OK(resultDict)
+
+
+class WMSAdministratorHandler(WMSAdministratorHandlerMixin, RequestHandler):
+    pass