From cc8daff4df63549c2d9f241128e66132cb26afb6 Mon Sep 17 00:00:00 2001 From: Zoltan Mathe Date: Tue, 12 Nov 2019 15:11:33 +0100 Subject: [PATCH 1/3] move the InputDataModule under Operations --- Interfaces/API/Dirac.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Interfaces/API/Dirac.py b/Interfaces/API/Dirac.py index e4a067e366a..004cc7b5c01 100755 --- a/Interfaces/API/Dirac.py +++ b/Interfaces/API/Dirac.py @@ -45,11 +45,13 @@ from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd from DIRAC.Core.Utilities.Subprocess import systemCall from DIRAC.Core.Utilities.ModuleFactory import ModuleFactory +from Core.Utilities.Decorators import deprecated from DIRAC.Core.Security import Locations from DIRAC.Core.Security.X509Chain import X509Chain # pylint: disable=import-error from DIRAC.Core.Security.ProxyInfo import getProxyInfo from DIRAC.ConfigurationSystem.Client.PathFinder import getSystemSection, getServiceURL from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup +from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations from DIRAC.ConfigurationSystem.Client.LocalConfiguration import LocalConfiguration from DIRAC.Interfaces.API.JobRepository import JobRepository from DIRAC.DataManagementSystem.Client.DataManager import DataManager @@ -591,6 +593,7 @@ def __monitorSubmittedJob(self, jobID): ############################################################################# @staticmethod + @deprecated("It will be removed in v7r2. Use Operations sections only!") def __getVOPolicyModule(module): """ Utility to get the VO Policy module name """ @@ -649,9 +652,9 @@ def getInputDataCatalog(self, lfns, siteName='', fileName='pool_xml_catalog.xml' self.log.verbose(localSEList) - inputDataPolicy = self.__getVOPolicyModule('InputDataModule') + inputDataPolicy = Operations().getValue('InputDataPolicy/InputDataModule') if not inputDataPolicy: - return self._errorReport('Could not retrieve DIRAC/VOPolicy/InputDataModule for VO') + return self._errorReport('Could not retrieve /DIRAC/Operations/InputDataPolicy/InputDataModule for VO') self.log.info('Attempting to resolve data for %s' % siteName) self.log.verbose('%s' % ('\n'.join(lfns))) @@ -764,9 +767,9 @@ def runLocal(self, job): return self._errorReport('LocalSite/LocalSE should be defined in your config file') localSEList = localSEList.replace(' ', '').split(',') self.log.debug("List of local SEs: %s" % localSEList) - inputDataPolicy = self.__getVOPolicyModule('InputDataModule') + inputDataPolicy = Operations().getValue('InputDataPolicy/InputDataModule') if not inputDataPolicy: - return self._errorReport('Could not retrieve DIRAC/VOPolicy/InputDataModule for VO') + return self._errorReport('Could not retrieve DIRAC/Operations/InputDataPolicy/InputDataModule for VO') self.log.info('Job has input data requirement, will attempt to resolve data for %s' % DIRAC.siteName()) self.log.verbose('\n'.join(inputData if isinstance(inputData, (list, tuple)) else [inputData])) From 133c45ecbfed9ed4bc8fcd2a4860e3851d9d440d Mon Sep 17 00:00:00 2001 From: Zoltan Mathe Date: Thu, 23 Jan 2020 11:53:03 +0100 Subject: [PATCH 2/3] correct the deprecated function import --- Interfaces/API/Dirac.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Interfaces/API/Dirac.py b/Interfaces/API/Dirac.py index 004cc7b5c01..2b1af9a823b 100755 --- a/Interfaces/API/Dirac.py +++ b/Interfaces/API/Dirac.py @@ -45,7 +45,7 @@ from DIRAC.Core.Utilities.ClassAd.ClassAdLight import ClassAd from DIRAC.Core.Utilities.Subprocess import systemCall from DIRAC.Core.Utilities.ModuleFactory import ModuleFactory -from Core.Utilities.Decorators import deprecated +from DIRAC.Core.Utilities.Decorators import deprecated from DIRAC.Core.Security import Locations from DIRAC.Core.Security.X509Chain import X509Chain # pylint: disable=import-error from DIRAC.Core.Security.ProxyInfo import getProxyInfo From ca8512bc3a2d9dd77afe10e3abccb74d2836cfbc Mon Sep 17 00:00:00 2001 From: zmathe Date: Thu, 23 Apr 2020 16:27:08 +0200 Subject: [PATCH 3/3] Update Interfaces/API/Dirac.py Co-Authored-By: fstagni --- Interfaces/API/Dirac.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Interfaces/API/Dirac.py b/Interfaces/API/Dirac.py index 2b1af9a823b..53fec601109 100755 --- a/Interfaces/API/Dirac.py +++ b/Interfaces/API/Dirac.py @@ -593,7 +593,7 @@ def __monitorSubmittedJob(self, jobID): ############################################################################# @staticmethod - @deprecated("It will be removed in v7r2. Use Operations sections only!") + @deprecated("It will be removed after v7r2. Use Operations sections only!") def __getVOPolicyModule(module): """ Utility to get the VO Policy module name """