[integration] Update Webapp to the new import name for TimeUtilities

src/WebAppDIRAC/WebApp/handler/AccountingHandler.py

@@ -4,7 +4,7 @@
 import tempfile
 
 from DIRAC import gConfig, S_OK, S_ERROR
-from DIRAC.Core.Utilities import Time, List, DictCache
+from DIRAC.Core.Utilities import TimeUtilities, List, DictCache
 from DIRAC.Core.Utilities.Plotting.FileCoding import extractRequestFromFileId, codeRequestInFileId
 from DIRAC.AccountingSystem.Client.ReportsClient import ReportsClient
 from DIRAC.Core.Tornado.Client.ClientSelector import TransferClientSelector as TransferClient
@@ -136,19 +136,19 @@ def __parseFormParams(self, timeSelector, typeName=None, **pD):
         # Find the proper time!
         pD["timeSelector"] = timeSelector
         if pD["timeSelector"] > 0:
-            end = Time.dateTime()
+            end = datetime.datetime.utcnow()
             start = end - datetime.timedelta(seconds=pD["timeSelector"])
             if not pinDates:
                 extraParams["lastSeconds"] = pD["timeSelector"]
         else:
 
             end = False
             if "endTime" in pD:
-                end = Time.fromString(pD["endTime"])
+                end = TimeUtilities.fromString(pD["endTime"])
                 del pD["endTime"]
             if "startTime" not in pD:
                 return S_ERROR("Missing starTime!")
-            start = Time.fromString(pD["startTime"])
+            start = TimeUtilities.fromString(pD["startTime"])
             del pD["startTime"]
         del pD["timeSelector"]
 
@@ -290,10 +290,10 @@ def web_getCsvPlotData(self, typeName, plotName, timeSelector: int, grouping, **
         if "granularity" in rawData:
             granularity = rawData["granularity"]
             data = rawData["data"]
-            tS = int(Time.toEpoch(start))
+            tS = int(TimeUtilities.toEpoch(start))
             timeStart = tS - tS % granularity
             strData = "epoch,%s\n" % ",".join(groupKeys)
-            for timeSlot in range(timeStart, int(Time.toEpoch(end)), granularity):
+            for timeSlot in range(timeStart, int(TimeUtilities.toEpoch(end)), granularity):
                 lineData = [str(timeSlot)]
                 for key in groupKeys:
                     lineData.append(str(data[key][timeSlot]) if timeSlot in data[key] else "")

src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py

@@ -1,7 +1,6 @@
 import json
 import datetime
 
-from DIRAC.Core.Utilities import Time
 from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient
 from WebAppDIRAC.Lib.WebHandler import _WebHandler as WebHandler, WErr
 
@@ -49,7 +48,7 @@ def web_getInstallationData(self):
                         "UninstalledBy": uninstalledBy,
                     }
                 )
-            timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+            timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
             total = len(installations)
             callback = {"success": "true", "result": values, "total": total, "date": timestamp}
         else:

src/WebAppDIRAC/WebApp/handler/ConfigurationManagerHandler.py

@@ -1,10 +1,11 @@
 import json
+import datetime
 
 from diraccfg import CFG
 
 from DIRAC import gConfig
 from DIRAC.ConfigurationSystem.Client.ConfigurationClient import ConfigurationClient
-from DIRAC.Core.Utilities import Time, List
+from DIRAC.Core.Utilities import List
 from DIRAC.ConfigurationSystem.private.Modificator import Modificator
 
 from WebAppDIRAC.Lib.WebHandler import WebSocketHandler, WErr, asyncGen
@@ -602,7 +603,7 @@ def __setCommiter(self):
         commiter = "%s@%s - %s" % (
             self.getUserName(),
             self.getUserGroup(),
-            Time.dateTime().strftime("%Y-%m-%d %H:%M:%S"),
+            datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"),
         )
         self.__configData["cfgData"].commiterId = commiter
 

src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py

@@ -1,13 +1,13 @@
 from WebAppDIRAC.Lib.WebHandler import _WebHandler as WebHandler
-from DIRAC.Core.Utilities import Time
+import datetime
 
 
 class ExampleAppHandler(WebHandler):
 
     DEFAULT_AUTHORIZATION = "all"
 
     def web_getJobData(self):
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
         total = 5
         values = [
             {"ExampleId": 1, "ExampleValue": "Zoli"},

src/WebAppDIRAC/WebApp/handler/FileCatalogHandler.py

@@ -3,9 +3,9 @@
 import random
 import shutil
 import zipfile
+import datetime
 
 from DIRAC import gLogger, S_ERROR, S_OK
-from DIRAC.Core.Utilities import Time
 from DIRAC.Resources.Catalog.FileCatalog import FileCatalog
 from DIRAC.DataManagementSystem.Client.DataManager import DataManager
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
@@ -255,7 +255,7 @@ def web_getFilesData(self, limit=25, start=0, lfnPath=None, **kwargs):
                     "metadata": meta,
                 }
             )
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
         return {"success": "true", "result": callback, "total": total, "date": timestamp}
 
     def web_getMetadataFilesInFile(self, selection="", lfnPath=None):

src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py

@@ -1,7 +1,7 @@
 import json
+import datetime
 
 from DIRAC import gConfig, gLogger
-from DIRAC.Core.Utilities import Time
 from DIRAC.Core.Utilities import DictCache
 from DIRAC.Core.Utilities.Graphs.Palette import Palette
 from DIRAC.RequestManagementSystem.Client.Request import Request
@@ -83,7 +83,7 @@ def web_getJobData(self):
         extra = None
         if "Extras" in result:
             extra = result["Extras"]
-            timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+            timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
             extra["date"] = timestamp
 
         return {"success": "true", "result": callback, "total": total, "extra": extra}

src/WebAppDIRAC/WebApp/handler/MonitoringHandler.py

@@ -5,7 +5,7 @@
 
 from DIRAC import gConfig, S_OK, S_ERROR, gLogger
 from DIRAC.Core.Tornado.Client.ClientSelector import TransferClientSelector as TransferClient
-from DIRAC.Core.Utilities import Time, List, DictCache
+from DIRAC.Core.Utilities import TimeUtilities, List, DictCache
 from DIRAC.Core.Utilities.Plotting.FileCoding import extractRequestFromFileId, codeRequestInFileId
 from DIRAC.MonitoringSystem.Client.MonitoringClient import MonitoringClient
 
@@ -109,20 +109,20 @@ def __parseFormParams(self):
         # Find the proper time!
         pD["timeSelector"] = int(pD["timeSelector"])
         if pD["timeSelector"] > 0:
-            end = Time.dateTime()
+            end = datetime.datetime.utcnow()
             start = end - datetime.timedelta(seconds=pD["timeSelector"])
             if not pinDates:
                 extraParams["lastSeconds"] = pD["timeSelector"]
         else:
             if "endTime" not in pD:
                 end = False
             else:
-                end = Time.fromString(pD["endTime"])
+                end = TimeUtilities.fromString(pD["endTime"])
                 del pD["endTime"]
             if "startTime" not in pD:
                 return S_ERROR("Missing starTime!")
             else:
-                start = Time.fromString(pD["startTime"])
+                start = TimeUtilities.fromString(pD["startTime"])
                 del pD["startTime"]
         del pD["timeSelector"]
 
@@ -233,10 +233,10 @@ def web_getCsvPlotData(self):
         if "granularity" in rawData:
             granularity = rawData["granularity"]
             data = rawData["data"]
-            tS = int(Time.toEpoch(params[2]))
+            tS = int(TimeUtilities.toEpoch(params[2]))
             timeStart = tS - tS % granularity
             strData = "epoch,%s\n" % ",".join(groupKeys)
-            for timeSlot in range(timeStart, int(Time.toEpoch(params[3])), granularity):
+            for timeSlot in range(timeStart, int(TimeUtilities.toEpoch(params[3])), granularity):
                 lineData = [str(timeSlot)]
                 for key in groupKeys:
                     if timeSlot in data[key]:

src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py

@@ -1,7 +1,7 @@
 import json
+import datetime
 
 from DIRAC import gConfig, S_OK, gLogger
-from DIRAC.Core.Utilities import Time
 from DIRAC.Core.Utilities.Graphs.Palette import Palette
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getUsernameForDN
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
@@ -51,7 +51,7 @@ def web_getPilotData(self):
                 tmp[head[j]] = i[j]
             callback.append(tmp)
         total = result["TotalRecords"]
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
         if "Extras" in result:
             return {"success": "true", "result": callback, "total": total, "extra": result["Extras"], "date": timestamp}
         return {"success": "true", "result": callback, "total": total, "date": timestamp}

src/WebAppDIRAC/WebApp/handler/PilotSummaryHandler.py

@@ -1,7 +1,7 @@
 import json
+import datetime
 
 from DIRAC import gConfig, gLogger
-from DIRAC.Core.Utilities import Time
 from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient
 from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient
 from WebAppDIRAC.Lib.WebHandler import _WebHandler as WebHandler
@@ -43,7 +43,7 @@ def web_getPilotSummaryData(self):
             callback.append(tmp)
         total = result["TotalRecords"]
         total = result["TotalRecords"]
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
         if "Extras" in result:
             st = self.__dict2string({})
             extra = result["Extras"]

src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py

@@ -1,6 +1,7 @@
 import json
+import datetime
+
 from DIRAC import gConfig, gLogger
-from DIRAC.Core.Utilities import Time
 from DIRAC.Core.Utilities.List import uniqueElements
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
 
@@ -95,7 +96,7 @@ def web_getProxyManagerData(self):
         #                   'UserGroups': record['groups'],
         #                   'ExpirationTime': str(record['expirationtime']),
         #                   'Provider': record['provider']})
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
         data = {"success": "true", "result": proxies, "total": svcData["TotalRecords"], "date": timestamp}
         self.finish(data)
 

src/WebAppDIRAC/WebApp/handler/RequestMonitorHandler.py

@@ -1,7 +1,7 @@
 import json
+import datetime
 
 from DIRAC import gLogger
-from DIRAC.Core.Utilities import Time
 from DIRAC.RequestManagementSystem.Client.ReqClient import ReqClient
 
 from WebAppDIRAC.Lib.WebHandler import WebHandler, asyncGen
@@ -66,7 +66,7 @@ def web_getRequestMonitorData(self):
             callback.append(tmp)
         total = result["TotalRecords"]
         total = result["TotalRecords"]
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
         if "Extras" in result:
             st = self.__dict2string({})
             extra = result["Extras"]

src/WebAppDIRAC/WebApp/handler/ResourceSummaryHandler.py

@@ -1,8 +1,8 @@
 import collections
 import json
+import datetime
 
 from DIRAC import gLogger
-from DIRAC.Core.Utilities import Time
 from DIRAC.ResourceStatusSystem.Client.PublisherClient import PublisherClient
 from DIRAC.ResourceStatusSystem.PolicySystem.StateMachine import RSSMachine
 
@@ -446,6 +446,6 @@ def web_getResourceSummaryData(self):
 
         yield self.threadTask(rssMachine.orderPolicyResults, elementList)
 
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
 
         self.finish({"success": "true", "result": elementList, "total": len(elementList), "date": timestamp})

src/WebAppDIRAC/WebApp/handler/TokenManagerHandler.py

@@ -1,7 +1,7 @@
 import json
+import datetime
 
 from DIRAC import gConfig, gLogger
-from DIRAC.Core.Utilities import Time
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getAllUsers
 from DIRAC.FrameworkSystem.Client.TokenManagerClient import TokenManagerClient
 
@@ -53,7 +53,7 @@ def web_getTokenManagerData(self, username="[]", **kwargs):
                     "ExpirationTime": str(record["rt_expires_at"]),
                 }
             )
-        timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+        timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
         return {"success": "true", "result": tokens, "total": len(tokens), "date": timestamp}
 
     def web_deleteTokens(self, idList):

src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py

@@ -2,9 +2,10 @@
 """
 
 import json
+import datetime
 
 from DIRAC import gConfig, gLogger
-from DIRAC.Core.Utilities import Time
+from DIRAC.Core.Utilities import TimeUtilities
 from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
 
 from WebAppDIRAC.Lib.WebHandler import WebHandler, WErr, asyncGen
@@ -93,7 +94,7 @@ def web_getSelectionData(self):
 
     @asyncGen
     def web_getTransformationData(self):
-        pagestart = Time.time()
+        pagestart = datetime.datetime.utcnow()
         user = self.getUserName()
 
         tsClient = TransformationClient(timeout=3600)
@@ -147,12 +148,12 @@ def web_getTransformationData(self):
             if "Extras" in result:
                 gLogger.info(result["Extras"])
                 extra = result["Extras"]
-                timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+                timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
                 callback = {"success": "true", "result": callback, "total": total, "extra": extra, "date": timestamp}
             else:
                 callback = {"success": "true", "result": callback, "total": total, "date": None}
 
-            gLogger.info("\033[0;31m PRODUCTION SUBMIT REQUEST: \033[0m %s" % (Time.time() - pagestart))
+            gLogger.info("\033[0;31m PRODUCTION SUBMIT REQUEST: \033[0m %s" % (datetime.datetime.utcnow() - pagestart))
         self.finish(json.dumps(callback))
 
     ################################################################################
@@ -311,7 +312,7 @@ def __getLoggingInfo(self, transid):
                 for i in result:
                     DN = i["AuthorDN"]
                     i["AuthorDN"] = dndb.get(DN, DN)
-                    date = Time.toString(i["MessageDate"])
+                    date = TimeUtilities.toString(i["MessageDate"])
                     callback.append([i["Message"], date, i["AuthorDN"]])
                 callback = {"success": "true", "result": callback}
             else:
@@ -405,7 +406,7 @@ def web_showFileStatus(self):
                                 tmp = {head[j]: i[j] for j in range(headLength)}
                                 callback.append(tmp)
                             total = result["TotalRecords"]
-                            timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]")
+                            timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]")
                             if "Extras" in result:
                                 extra = result["Extras"]
                                 callback = {