Merge pull request #5728 from aldbr/cherry-pick-2-ceace18b8-integration

[sweep:integration] feat (wms): use db12 package to compute cpu power

Author: chrisburr

environment.yml

@@ -16,6 +16,7 @@ dependencies:
   - cachetools
   - certifi
   - cmreshandler >1.0.0b4
+  - db12
   - elasticsearch <7.14
   - elasticsearch-dsl
   - fts3

src/DIRAC/WorkloadManagementSystem/Client/CPUNormalization.py

@@ -12,12 +12,12 @@
 
 import os
 from urllib.request import urlopen
+from db12 import single_dirac_benchmark
 
 import DIRAC
 from DIRAC import gConfig, gLogger, S_OK, S_ERROR
 from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getCESiteMapping
 from DIRAC.Resources.Computing.BatchSystems.TimeLeft.TimeLeft import TimeLeft
-from DIRAC.WorkloadManagementSystem.Client.DIRACbenchmark import singleDiracBenchmark
 
 __RCSID__ = "$Id$"
 
@@ -162,7 +162,7 @@ def getCPUNormalization(reference="HS06", iterations=1):
 
     corr = Operations().getValue("JobScheduling/CPUNormalizationCorrection", 1.0)
 
-    result = singleDiracBenchmark(iterations)
+    result = single_dirac_benchmark(iterations)
 
     if result is None:
         return S_ERROR("Cannot get benchmark measurements")

src/DIRAC/WorkloadManagementSystem/Client/DIRACbenchmark.py

@@ -20,11 +20,12 @@
 
 __RCSID__ = "$Id$"
 
+from db12 import single_dirac_benchmark
+
 import DIRAC
 from DIRAC.Core.Utilities.DIRACScript import DIRACScript as Script
 
 from DIRAC import gLogger, gConfig
-from DIRAC.WorkloadManagementSystem.Client.DIRACbenchmark import singleDiracBenchmark
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 
 
@@ -43,7 +44,7 @@ def main():
         elif unprocSw[0] in ("R", "Reconfig"):
             configFile = unprocSw[1]
 
-    result = singleDiracBenchmark(1)
+    result = single_dirac_benchmark()
 
     if result is None:
         gLogger.error("Cannot make benchmark measurements")