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

DIRAC/FrameworkSystem/private/authorization/AuthServer.py

@@ -333,13 +333,13 @@ class AuthServer(_AuthorizationServer):
         """Parse request. Rewrite authlib method."""
         return self.create_oauth2_request(request, JsonRequest, True)
 
-    def validate_requested_scope(self, scope, state=None):
+    def validate_requested_scope(self, scope):
         """See :func:`authlib.oauth2.rfc6749.authorization_server.validate_requested_scope`"""
         # We also consider parametric scope containing ":" charter
         extended_scope = list_to_scope(
             [re.sub(r":.*$", ":", s) for s in scope_to_list((scope or "").replace("+", " "))]
         )
-        super().validate_requested_scope(extended_scope, state)
+        super().validate_requested_scope(extended_scope)
 
     def handle_response(self, status_code=None, payload=None, headers=None, newSession=None, delSession=None):
         """Handle response

DIRAC/FrameworkSystem/scripts/dirac_admin_update_pilot.py

@@ -2,6 +2,8 @@
 """
 Script to update pilot version in CS
 """
+from packaging.version import Version
+
 import DIRAC
 from DIRAC.Core.Base.Script import Script
 
@@ -25,8 +27,9 @@ def main():
         if switch[0] == "v" or switch[0] == "vo":
             vo = switch[1]
 
-    from DIRAC import S_OK, S_ERROR
-    from DIRAC import gConfig, gLogger
+    from DIRAC import S_OK
+    from DIRAC import gLogger
+    from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
     from DIRAC.ConfigurationSystem.Client.CSAPI import CSAPI
 
     def updatePilot(version, vo):
@@ -38,21 +41,25 @@ def main():
         :param version: version vArBpC of pilot you want to use
         :param vo: Location of pilot version in CS /Operations/<vo>/Pilot/Version
         """
-        # FIXME: use Operations() object
-        pilotVersion = gConfig.getValue(f"Operations/{vo}/Pilot/Version", [])
-        if not pilotVersion:
-            return S_ERROR(f"No pilot version set under Operations/{vo}/Pilot/Version in CS")
-
-        pilotVersion.pop()
-        pilotVersion.insert(0, version)
+        pilotVersion = sorted(Operations(vo=vo).getValue("Pilot/Version", []), key=lambda x: Version(x), reverse=True)
+        if version in pilotVersion:
+            gLogger.warn(f"Version {version} already set in CS")
+        elif pilotVersion:
+            pilotVersion = [version, pilotVersion[0]]
+        else:
+            gLogger.warn("No pilot version set in CS")
+            pilotVersion = [version]
         api = CSAPI()
-        api.setOption(f"Operations/{vo}/Pilot/Version", ", ".join(pilotVersion))
+        if vo:
+            api.setOption(f"Operations/{vo}/Pilot/Version", ", ".join(pilotVersion))
+        else:
+            api.setOption("Operations/Defaults/Pilot/Version", ", ".join(pilotVersion))
         result = api.commit()
         if not result["OK"]:
             gLogger.fatal("Could not commit new version of pilot!")
             return result
 
-        newVersion = gConfig.getValue(f"Operations/{vo}/Pilot/Version")
+        newVersion = Operations(vo=vo).getValue("Pilot/Version")
         return S_OK(f"New version of pilot set to {newVersion}")
 
     result = updatePilot(version, vo)

DIRAC/FrameworkSystem/scripts/dirac_login.py

@@ -38,8 +38,8 @@ Script.disableCS()
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import (
     findDefaultGroupForDN,
     getGroupOption,
+    getVOForGroup,
     getVOMSAttributeForGroup,
-    getVOMSVOForGroup,
 )
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
 from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import (
@@ -285,7 +285,7 @@ class Params:
                 if not (vomsAttr := getVOMSAttributeForGroup(self.group)):
                     print(HTML(f"<yellow>No VOMS attribute foud for {self.group}</yellow>"))
                 else:
-                    vo = getVOMSVOForGroup(self.group)
+                    vo = getVOForGroup(self.group)
                     if not (result := VOMS().setVOMSAttributes(self.outputFile, attribute=vomsAttr, vo=vo))["OK"]:
                         return S_ERROR(f"Failed adding VOMS attribute: {result['Message']}")
                     chain = result["Value"]

DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py

@@ -6,21 +6,20 @@ Example:
   $ dirac-proxy-init -g dirac_user
   Enter Certificate password: **************
 """
+import datetime
+import glob
 import os
 import sys
-import glob
 import time
-import datetime
 
 import DIRAC
-
-from DIRAC import gLogger, gConfig, S_OK, S_ERROR
+from DIRAC import S_ERROR, S_OK, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers import Registry
 from DIRAC.Core.Base.Script import Script
-from DIRAC.FrameworkSystem.Client import ProxyGeneration, ProxyUpload
-from DIRAC.Core.Security import X509Chain, ProxyInfo, VOMS
+from DIRAC.Core.Security import VOMS, ProxyInfo, X509Chain
 from DIRAC.Core.Security.DiracX import addTokenToPEM
 from DIRAC.Core.Security.Locations import getCAsLocation, getDefaultProxyLocation
-from DIRAC.ConfigurationSystem.Client.Helpers import Registry
+from DIRAC.FrameworkSystem.Client import ProxyGeneration, ProxyUpload
 from DIRAC.FrameworkSystem.Client.BundleDeliveryClient import BundleDeliveryClient
 
 
@@ -97,7 +96,7 @@ class ProxyInit:
             )
 
         resultVomsAttributes = VOMS.VOMS().setVOMSAttributes(
-            self.__proxyGenerated, attribute=vomsAttr, vo=Registry.getVOMSVOForGroup(self.__piParams.diracGroup)
+            self.__proxyGenerated, attribute=vomsAttr, vo=Registry.getVOForGroup(self.__piParams.diracGroup)
         )
         if not resultVomsAttributes["OK"]:
             return S_ERROR(

DIRAC/Interfaces/API/Dirac.py

@@ -46,8 +46,7 @@ from DIRAC.WorkloadManagementSystem.Client import JobStatus
 from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
 from DIRAC.WorkloadManagementSystem.Client.SandboxStoreClient import SandboxStoreClient
 from DIRAC.WorkloadManagementSystem.Client.WMSClient import WMSClient
-
-COMPONENT_NAME = "DiracAPI"
+from DIRAC.WorkloadManagementSystem.Utilities.jobAdministration import _filterJobStateTransition
 
 
 def parseArguments(args):
@@ -423,6 +422,14 @@ class Dirac(API):
                 sandbox = [isFile.strip() for isFile in sandbox.split(",")]
             for isFile in sandbox:
                 self.log.debug(f"Resolving Input Sandbox {isFile}")
+                # If the sandbox is already in the sandbox store, download it
+                if isFile.startswith("SB:"):
+                    result = SandboxStoreClient(useCertificates=self.useCertificates).downloadSandbox(
+                        isFile, destinationDir=os.getcwd()
+                    )
+                    if not result["OK"]:
+                        return S_ERROR(f"Cannot download Input sandbox {isFile}: {result['Message']}")
+                    continue
                 if isFile.lower().startswith("lfn:"):  # isFile is an LFN
                     isFile = isFile[4:]
                 # Attempt to copy into job working directory, unless it is already there
@@ -1452,10 +1459,12 @@ class Dirac(API):
         # Remove any job IDs that can't change to the Killed or Deleted states
         filteredJobs = set()
         for filterState in (JobStatus.KILLED, JobStatus.DELETED):
-            filterRes = JobStatus.filterJobStateTransition(jobIDs, filterState)
-            if not filterRes["OK"]:
-                return filterRes
-            filteredJobs.update(filterRes["Value"])
+            # get a dictionary of jobID:status
+            res = JobMonitoringClient().getJobsStatus(jobIDs)
+            if not res["OK"]:
+                return res
+            # then filter
+            filteredJobs.update(_filterJobStateTransition(res["Value"], filterState))
 
         return WMSClient(useCertificates=self.useCertificates).deleteJob(list(filteredJobs))
 
@@ -1482,11 +1491,12 @@ class Dirac(API):
             return ret
         jobIDs = ret["Value"]
 
-        # Remove any job IDs that can't change to the rescheduled state
-        filterRes = JobStatus.filterJobStateTransition(jobIDs, JobStatus.RESCHEDULED)
-        if not filterRes["OK"]:
-            return filterRes
-        jobIDsToReschedule = filterRes["Value"]
+        # get a dictionary of jobID:status
+        res = JobMonitoringClient().getJobsStatus(jobIDs)
+        if not res["OK"]:
+            return res
+        # then filter
+        jobIDsToReschedule = _filterJobStateTransition(res["Value"], JobStatus.RESCHEDULED)
 
         return WMSClient(useCertificates=self.useCertificates).rescheduleJob(jobIDsToReschedule)
 
@@ -1512,10 +1522,12 @@ class Dirac(API):
         # Remove any job IDs that can't change to the Killed or Deleted states
         filteredJobs = set()
         for filterState in (JobStatus.KILLED, JobStatus.DELETED):
-            filterRes = JobStatus.filterJobStateTransition(jobIDs, filterState)
-            if not filterRes["OK"]:
-                return filterRes
-            filteredJobs.update(filterRes["Value"])
+            # get a dictionary of jobID:status
+            res = JobMonitoringClient().getJobsStatus(jobIDs)
+            if not res["OK"]:
+                return res
+            # then filter
+            filteredJobs.update(_filterJobStateTransition(res["Value"], filterState))
 
         return WMSClient(useCertificates=self.useCertificates).killJob(list(filteredJobs))
 

DIRAC/Interfaces/API/DiracAdmin.py

@@ -4,7 +4,9 @@ All administrative functionality is exposed through the DIRAC Admin API.  Exampl
 site banning and unbanning, WMS proxy uploading etc.
 
 """
+
 import os
+from datetime import datetime, timedelta
 
 from DIRAC import S_ERROR, S_OK, gConfig, gLogger
 from DIRAC.ConfigurationSystem.Client.CSAPI import CSAPI
@@ -19,14 +21,15 @@ from DIRAC.ResourceStatusSystem.Client.SiteStatus import SiteStatus
 from DIRAC.WorkloadManagementSystem.Client.JobManagerClient import JobManagerClient
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
 from DIRAC.WorkloadManagementSystem.Client.WMSAdministratorClient import WMSAdministratorClient
+from DIRAC.WorkloadManagementSystem.Service.WMSUtilities import (
+    killPilotsInQueues,
+)
 
 voName = ""
 ret = getProxyInfo(disableVOMS=True)
 if ret["OK"] and "group" in ret["Value"]:
     voName = getVOForGroup(ret["Value"]["group"])
 
-COMPONENT_NAME = "/Interfaces/API/DiracAdmin"
-
 
 class DiracAdmin(API):
     """Administrative functionalities"""
@@ -38,11 +41,6 @@ class DiracAdmin(API):
 
         self.csAPI = CSAPI()
 
-        self.dbg = False
-        if gConfig.getValue(self.section + "/LogLevel", "DEBUG") == "DEBUG":
-            self.dbg = True
-
-        self.scratchDir = gConfig.getValue(self.section + "/ScratchDir", "/tmp")
         self.currentDir = os.getcwd()
         self.sitestatus = SiteStatus()
 
@@ -154,7 +152,7 @@ class DiracAdmin(API):
         return result
 
     #############################################################################
-    def allowSite(self, site, comment, printOutput=False):
+    def allowSite(self, site, comment, printOutput=False, days=1):
         """Adds the site to the site mask. The site must be a valid DIRAC site name
 
         Example usage:
@@ -178,7 +176,13 @@ class DiracAdmin(API):
                 gLogger.notice(f"Site {site} is already Active")
             return S_OK(f"Site {site} is already Active")
 
-        if not (result := self.sitestatus.setSiteStatus(site, "Active", comment))["OK"]:
+        tokenLifetime = int(days)
+        if tokenLifetime <= 0:
+            tokenExpiration = datetime.max
+        else:
+            tokenExpiration = datetime.utcnow().replace(microsecond=0) + timedelta(days=tokenLifetime)
+
+        if not (result := self.sitestatus.setSiteStatus(site, "Active", comment, expiry=tokenExpiration))["OK"]:
             return result
 
         if printOutput:
@@ -227,7 +231,7 @@ class DiracAdmin(API):
         return S_OK()
 
     #############################################################################
-    def banSite(self, site, comment, printOutput=False):
+    def banSite(self, site, comment, printOutput=False, days=1):
         """Removes the site from the site mask.
 
         Example usage:
@@ -240,7 +244,6 @@ class DiracAdmin(API):
         """
         if not (result := self._checkSiteIsValid(site))["OK"]:
             return result
-
         mask = self.getSiteMask(status="Banned")
         if not mask["OK"]:
             return mask
@@ -250,7 +253,12 @@ class DiracAdmin(API):
                 gLogger.notice(f"Site {site} is already Banned")
             return S_OK(f"Site {site} is already Banned")
 
-        if not (result := self.sitestatus.setSiteStatus(site, "Banned", comment))["OK"]:
+        tokenLifetime = int(days)
+        if tokenLifetime <= 0:
+            tokenExpiration = datetime.max
+        else:
+            tokenExpiration = datetime.utcnow().replace(microsecond=0) + timedelta(days=tokenLifetime)
+        if not (result := self.sitestatus.setSiteStatus(site, "Banned", comment, expiry=tokenExpiration))["OK"]:
             return result
 
         if printOutput:
@@ -456,11 +464,31 @@ class DiracAdmin(API):
         :param gridReference: Pilot Job Reference
         :return: S_OK,S_ERROR
         """
-        if not isinstance(gridReference, str):
-            return self._errorReport("Expected string for pilot reference")
-
-        result = PilotManagerClient().killPilot(gridReference)
-        return result
+        if not isinstance(gridReference, (str, list)):
+            return self._errorReport("Expected string or list of strings for pilot reference")
+
+        # Make a list if it is not yet
+        if isinstance(gridReference, str):
+            gridReference = [gridReference]
+
+        # Regroup pilots per site
+        pilotRefDict = {}
+        for pilotReference in gridReference:
+            result = PilotManagerClient().getPilotInfo(pilotReference)
+            if not result["OK"] or not result["Value"]:
+                return S_ERROR(f"Failed to get info for pilot {pilotReference}")
+
+            pilotDict = result["Value"][pilotReference]
+            queue = "@@@".join(
+                [pilotDict["VO"], pilotDict["GridSite"], pilotDict["DestinationSite"], pilotDict["Queue"]]
+            )
+            gridType = pilotDict["GridType"]
+            pilotRefDict.setdefault(queue, {})
+            pilotRefDict[queue].setdefault("PilotList", [])
+            pilotRefDict[queue]["PilotList"].append(pilotReference)
+            pilotRefDict[queue]["GridType"] = gridType
+
+        return killPilotsInQueues(pilotRefDict)
 
     #############################################################################
     def getPilotLoggingInfo(self, gridReference):

DIRAC/Interfaces/API/Job.py

@@ -22,30 +22,25 @@
 
    Note that several executables can be provided and wil be executed sequentially.
 """
-import re
 import os
+import re
 import shlex
-
 from io import StringIO
 from urllib.parse import quote
 
 from DIRAC import S_OK, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
+from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
+from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getCESiteMapping, getDIRACPlatforms
 from DIRAC.Core.Base.API import API
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
-from DIRAC.Core.Workflow.Parameter import Parameter
-from DIRAC.Core.Workflow.Workflow import Workflow
 from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd
-from DIRAC.Core.Utilities.Subprocess import systemCall
 from DIRAC.Core.Utilities.List import uniqueElements
-from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
-from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
-from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getCESiteMapping, getDIRACPlatforms
+from DIRAC.Core.Utilities.Subprocess import systemCall
+from DIRAC.Core.Workflow.Parameter import Parameter
+from DIRAC.Core.Workflow.Workflow import Workflow
 from DIRAC.Interfaces.API.Dirac import Dirac
-from DIRAC.Workflow.Utilities.Utils import getStepDefinition, addStepToWorkflow
-
-
-COMPONENT_NAME = "/Interfaces/API/Job"
+from DIRAC.Workflow.Utilities.Utils import addStepToWorkflow, getStepDefinition
 
 
 class BadJobParameterError(ValueError):
@@ -1110,6 +1105,7 @@ class Job(API):
                 uniqueInputSandbox = uniqueElements(finalInputSandbox.split(";"))
                 paramsDict["InputSandbox"]["value"] = ";".join(uniqueInputSandbox)
                 self.log.verbose(f"Final unique Input Sandbox {';'.join(uniqueInputSandbox)}")
+                paramsDict["InputSandbox"]["type"] = "JDL"
             else:
                 paramsDict["InputSandbox"] = {}
                 paramsDict["InputSandbox"]["value"] = extraFiles

DIRAC/Interfaces/scripts/dirac_admin_allow_site.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python
-########################################################################
-# File :    dirac-admin-allow-site
-# Author :  Stuart Paterson
-########################################################################
 """
 Add Site to Active mask for current Setup
 
@@ -17,13 +13,16 @@ from DIRAC.Core.Base.Script import Script
 @Script()
 def main():
     Script.registerSwitch("E:", "email=", "Boolean True/False (True by default)")
+    Script.registerSwitch(
+        "", "days=", "Number of days the token is valid for. Default is 1 day. 0 or less days denotes forever."
+    )
     # Registering arguments will automatically add their description to the help menu
     Script.registerArgument("Site:     Name of the Site")
     Script.registerArgument("Comment:  Reason of the action")
     Script.parseCommandLine(ignoreErrors=True)
 
     from DIRAC import exit as DIRACExit
-    from DIRAC import gLogger
+    from DIRAC import gConfig, gLogger
     from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
     from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
 
@@ -36,33 +35,28 @@ def main():
             Script.showHelp()
 
     email = True
+    days = 1
     for switch in Script.getUnprocessedSwitches():
         if switch[0] == "email":
             email = getBoolean(switch[1])
+        if switch[0] == "days":
+            days = int(switch[1])
 
     diracAdmin = DiracAdmin()
     exitCode = 0
     errorList = []
 
-    # result = promptUser(
-    #     'All the elements that are associated with this site will be active, '
-    #     'are you sure about this action?'
-    # )
-    # if not result['OK'] or result['Value'] is 'n':
-    #  print 'Script stopped'
-    #  DIRACExit( 0 )
-
     # parseCommandLine show help when mandatory arguments are not specified or incorrect argument
     site, comment = Script.getPositionalArgs(group=True)
-    result = diracAdmin.allowSite(site, comment, printOutput=True)
+    result = diracAdmin.allowSite(site, comment, printOutput=True, days=days)
     if not result["OK"]:
         errorList.append((site, result["Message"]))
         exitCode = 2
     else:
-        if email:
+        if email and not gConfig.getValue("/DIRAC/Security/UseServerCertificate"):
             userName = diracAdmin._getCurrentUser()
             if not userName["OK"]:
-                print("ERROR: Could not obtain current username from proxy")
+                gLogger.error("Could not obtain current username from proxy")
                 exitCode = 2
                 DIRACExit(exitCode)
             userName = userName["Value"]
@@ -81,10 +75,10 @@ def main():
                 fromAddress = Operations().getValue("ResourceStatus/Config/FromAddress", "")
                 result = diracAdmin.sendMail(address, subject, body, fromAddress=fromAddress)
         else:
-            print("Automatic email disabled by flag.")
+            gLogger.warn("Automatic email disabled by flag.")
 
     for error in errorList:
-        print("ERROR %s: %s" % error)
+        gLogger.error(error)
 
     DIRACExit(exitCode)
 

DIRAC/Interfaces/scripts/dirac_admin_ban_site.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python
-########################################################################
-# File :    dirac-admin-ban-site
-# Author :  Stuart Paterson
-########################################################################
 """
 Remove Site from Active mask for current Setup
 
@@ -17,13 +13,16 @@ from DIRAC.Core.Base.Script import Script
 @Script()
 def main():
     Script.registerSwitch("E:", "email=", "Boolean True/False (True by default)")
+    Script.registerSwitch(
+        "", "days=", "Number of days the token is valid for. Default is 1 day. 0 or less days denotes forever."
+    )
     # Registering arguments will automatically add their description to the help menu
     Script.registerArgument("Site:     Name of the Site")
     Script.registerArgument("Comment:  Reason of the action")
     Script.parseCommandLine(ignoreErrors=True)
 
     from DIRAC import exit as DIRACExit
-    from DIRAC import gLogger
+    from DIRAC import gConfig, gLogger
     from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
     from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
 
@@ -36,9 +35,12 @@ def main():
             Script.showHelp()
 
     email = True
+    days = 1
     for switch in Script.getUnprocessedSwitches():
         if switch[0] == "email":
             email = getBoolean(switch[1])
+        if switch[0] == "days":
+            days = int(switch[1])
 
     diracAdmin = DiracAdmin()
     exitCode = 0
@@ -54,15 +56,15 @@ def main():
 
     # parseCommandLine show help when mandatory arguments are not specified or incorrect argument
     site, comment = Script.getPositionalArgs(group=True)
-    result = diracAdmin.banSite(site, comment, printOutput=True)
+    result = diracAdmin.banSite(site, comment, printOutput=True, days=days)
     if not result["OK"]:
         errorList.append((site, result["Message"]))
         exitCode = 2
     else:
-        if email:
+        if email and not gConfig.getValue("/DIRAC/Security/UseServerCertificate"):
             userName = diracAdmin._getCurrentUser()
             if not userName["OK"]:
-                print("ERROR: Could not obtain current username from proxy")
+                gLogger.error("Could not obtain current username from proxy")
                 exitCode = 2
                 DIRACExit(exitCode)
             userName = userName["Value"]
@@ -82,10 +84,10 @@ def main():
                 fromAddress = Operations().getValue("ResourceStatus/Config/FromAddress", "")
                 result = diracAdmin.sendMail(address, subject, body, fromAddress=fromAddress)
         else:
-            print("Automatic email disabled by flag.")
+            gLogger.warn("Automatic email disabled by flag.")
 
     for error in errorList:
-        print("ERROR %s: %s" % error)
+        gLogger.error(error)
 
     DIRACExit(exitCode)
 

DIRAC/Interfaces/scripts/dirac_admin_get_site_mask.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python
-########################################################################
-# File :    dirac-admin-get-site-mask
-# Author :  Stuart Paterson
-########################################################################
 """
 Get the list of sites enabled in the mask for job submission
 
@@ -25,17 +21,12 @@ def main():
     from DIRAC import exit as DIRACExit, gLogger
     from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
 
-    diracAdmin = DiracAdmin()
-
-    gLogger.setLevel("ALWAYS")
-
-    result = diracAdmin.getSiteMask(printOutput=True, status="Active")
-    if result["OK"]:
-        DIRACExit(0)
-    else:
-        print(result["Message"])
+    if not (result := DiracAdmin().getSiteMask(printOutput=True, status="Active"))["OK"]:
+        gLogger.error(result["Message"])
         DIRACExit(2)
 
+    DIRACExit(0)
+
 
 if __name__ == "__main__":
     main()

DIRAC/Interfaces/scripts/dirac_admin_reset_job.py

@@ -1,8 +1,4 @@
 #!/usr/bin/env python
-########################################################################
-# File :    dirac-admin-reset-job
-# Author :  Stuart Paterson
-########################################################################
 """
 Reset a job or list of jobs in the WMS
 
@@ -20,6 +16,7 @@ def main():
     Script.registerArgument(["JobID:    DIRAC Job IDs"])
     _, args = Script.parseCommandLine(ignoreErrors=True)
 
+    from DIRAC import gLogger
     from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
 
     diracAdmin = DiracAdmin()
@@ -36,13 +33,13 @@ def main():
 
         result = diracAdmin.resetJob(job)
         if result["OK"]:
-            print(f"Reset Job {job}")
+            gLogger.notice(f"Reset Job {job}")
         else:
             errorList.append((job, result["Message"]))
             exitCode = 2
 
     for error in errorList:
-        print("ERROR %s: %s" % error)
+        gLogger.error(error)
 
     DIRAC.exit(exitCode)
 

DIRAC/Interfaces/scripts/dirac_wms_job_parameters.py

@@ -17,7 +17,6 @@ Example:
    'LocalAccount': 'prod006',
    'LocalBatchID': '',
    'LocalJobID': '277821.ce.labmc.inf.utfsm.cl',
-   'MatcherServiceTime': '2.27646398544',
    'Memory(kB)': '858540kB',
    'ModelName': 'Intel(R)Xeon(R)CPU5110@1.60GHz',
    'NormCPUTime(s)': '1.02',

DIRAC/MonitoringSystem/Client/Types/WMSHistory.py

@@ -30,6 +30,8 @@ class WMSHistory(BaseType):
             "MinorStatus",
             "ApplicationStatus",
             "JobSplitType",
+            "Tier",
+            "Type",
         ]
 
         self.monitoringFields = ["Jobs", "Reschedules"]
@@ -46,6 +48,8 @@ class WMSHistory(BaseType):
                 "User": {"type": "keyword"},
                 "JobGroup": {"type": "keyword"},
                 "UserGroup": {"type": "keyword"},
+                "Tier": {"type": "keyword"},
+                "Type": {"type": "keyword"},
             }
         )
         # {'timestamp': {'type': 'date'}} will be added for all monitoring types

DIRAC/MonitoringSystem/Client/WebAppClient.py

@@ -0,0 +1,26 @@
+""" Module that contains client access to the WebApp handler.
+"""
+
+from DIRAC.Core.Base.Client import Client, createClient
+
+
+@createClient("Monitoring/WebApp")
+class WebAppClient(Client):
+    """WebAppClient sets url for the WebAppHandler."""
+
+    def __init__(self, url=None, **kwargs):
+        """
+        Sets URL for WebApp handler
+
+        :param self: self reference
+        :param url: url of the WebAppHandler
+        :param kwargs: forwarded to the Base Client class
+        """
+
+        super().__init__(**kwargs)
+
+        if not url:
+            self.serverURL = "Monitoring/WebApp"
+
+        else:
+            self.serverURL = url

DIRAC/MonitoringSystem/ConfigTemplate.cfg

@@ -28,4 +28,13 @@ Services
     }
   }
   ##END
+  ##BEGIN WebApp
+  WebApp
+  {
+    Port = 9199
+    Authorization
+    {
+      Default = authenticated
+    }
+  }
 }