Skip to content

Commit 9c5a64e

Browse files
committed
fix: removed DIRACScript.py
1 parent e04676f commit 9c5a64e

File tree

4 files changed

+0
-44
lines changed

4 files changed

+0
-44
lines changed

src/DIRAC/Core/Utilities/DIRACScript.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/DIRAC/Resources/ProxyProvider/test/Test_DIRACCAProxyProvider.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ def check(proxyStr, proxyProvider, name):
105105
for result in [
106106
chain.getRemainingSecs(),
107107
chain.getIssuerCert(),
108-
chain.getCertList(),
109108
chain.getNumCertsInChain(),
110109
chain.generateProxyToString(3600),
111110
chain.generateProxyToFile(proxyFile, 3600),

src/DIRAC/WorkloadManagementSystem/DB/JobLoggingDB.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ def addLoggingRecord(
3535
applicationStatus="idem",
3636
date=None,
3737
source="Unknown",
38-
minor=None,
39-
application=None,
4038
):
4139
"""Add a new entry to the JobLoggingDB table. One, two or all the three status
4240
components (status, minorStatus, applicationStatus) can be specified.
@@ -46,13 +44,6 @@ def addLoggingRecord(
4644
UTC time is used.
4745
"""
4846

49-
# Backward compatibility
50-
# FIXME: to remove in next version
51-
if minor:
52-
minorStatus = minor
53-
if application:
54-
applicationStatus = application
55-
5647
event = f"status/minor/app={status}/{minorStatus}/{applicationStatus}"
5748
self.log.info("Adding record for job ", str(jobID) + ": '" + event + "' from " + source)
5849

src/DIRAC/WorkloadManagementSystem/Executor/JobScheduling.py

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -335,33 +335,6 @@ def __getSitesRequired(self, jobManifest):
335335

336336
return S_OK((sites, bannedSites))
337337

338-
def __filterByPlatform(self, jobPlatform, userSites):
339-
"""Filters out sites that have no CE with a matching platform."""
340-
basePath = "/Resources/Sites"
341-
filteredSites = set()
342-
343-
# FIXME: can use Resources().getSiteCEMapping()
344-
for site in userSites:
345-
if "." not in site:
346-
# Invalid site name: Doesn't contain a dot!
347-
self.jobLog.warn("Skipped invalid site name", site)
348-
continue
349-
grid = site.split(".")[0]
350-
sitePath = cfgPath(basePath, grid, site, "CEs")
351-
result = gConfig.getSections(sitePath)
352-
if not result["OK"]:
353-
self.jobLog.info("Failed to get CEs", "at site %s" % site)
354-
continue
355-
siteCEs = result["Value"]
356-
357-
for CEName in siteCEs:
358-
CEPlatform = gConfig.getValue(cfgPath(sitePath, CEName, "OS"))
359-
if jobPlatform == CEPlatform:
360-
# Site has a CE with a matchin platform
361-
filteredSites.add(site)
362-
363-
return S_OK(list(filteredSites))
364-
365338
def _getTagsFromManifest(self, jobManifest):
366339
"""helper method to add a list of tags to the TQ from the job manifest content"""
367340

0 commit comments

Comments
 (0)