Skip to content

[v7r2] Move DIRAC/VOPolicy/InputDataModule under Operations/InputDataPolicy #4339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 3 commits into from
May 5, 2020
Merged

[v7r2] Move DIRAC/VOPolicy/InputDataModule under Operations/InputDataPolicy #4339

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc8daff
move the InputDataModule under Operations
Nov 12, 2019
133c45e
correct the deprecated function import
Jan 23, 2020
ca8512b
Update Interfaces/API/Dirac.py
Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Interfaces/API/Dirac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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 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
Expand Down Expand Up @@ -591,6 +593,7 @@ def __monitorSubmittedJob(self, jobID):

#############################################################################
@staticmethod
@deprecated("It will be removed after v7r2. Use Operations sections only!")
def __getVOPolicyModule(module):
""" Utility to get the VO Policy module name
"""
Expand Down Expand Up @@ -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)))
Expand Down Expand Up @@ -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]))
Expand Down