fix: removed unused RPCs

Author: fstagni

src/DIRAC/WorkloadManagementSystem/FutureClient/JobStateUpdateClient.py

@@ -83,12 +83,6 @@ def setJobAttribute(self, jobID: str | int, attribute: str, value: str):
             else:
                 return api.jobs.patch_metadata({jobID: {attribute: value}})
 
-    @stripValueIfOK
-    @convertToReturnValue
-    def setJobFlag(self, jobID: str | int, flag: str):
-        with DiracXClient() as api:
-            api.jobs.patch_metadata({jobID: {flag: True}})
-
     @stripValueIfOK
     @convertToReturnValue
     def setJobParameter(self, jobID: str | int, name: str, value: str):
@@ -151,12 +145,6 @@ def setJobsParameter(self, jobsParameterDict: dict):
             updates = {job_id: {k: v} for job_id, (k, v) in jobsParameterDict.items()}
             api.jobs.patch_metadata(updates)
 
-    @stripValueIfOK
-    @convertToReturnValue
-    def unsetJobFlag(self, jobID: str | int, flag: str):
-        with DiracXClient() as api:
-            api.jobs.patch_metadata({jobID: {flag: False}})
-
     @stripValueIfOK
     @convertToReturnValue
     def updateJobFromStager(self, jobID: str | int, status: str):

src/DIRAC/WorkloadManagementSystem/Service/JobStateUpdateHandler.py

@@ -128,22 +128,6 @@ def export_setJobSite(cls, jobID, site):
         """Allows the site attribute to be set for a job specified by its jobID."""
         return cls.jobDB.setJobAttribute(int(jobID), "Site", site)
 
-    ###########################################################################
-    types_setJobFlag = [[str, int], str]
-
-    @classmethod
-    def export_setJobFlag(cls, jobID, flag):
-        """Set job flag for job with jobID"""
-        return cls.jobDB.setJobAttribute(int(jobID), flag, "True")
-
-    ###########################################################################
-    types_unsetJobFlag = [[str, int], str]
-
-    @classmethod
-    def export_unsetJobFlag(cls, jobID, flag):
-        """Unset job flag for job with jobID"""
-        return cls.jobDB.setJobAttribute(int(jobID), flag, "False")
-
     ###########################################################################
     types_setJobApplicationStatus = [[str, int], str, str]
 

tests/Integration/FutureClient/WorkloadManagement/Test_JobStateUpdate.py

@@ -142,42 +142,6 @@ def test_setJobAttribute(monkeypatch, example_jobids, args):
     assert result[example_jobids[0]] == result[example_jobids[1]]
 
 
-def test_setJobFlag(monkeypatch, example_jobids):
-    # JobStateUpdateClient().setJobFlag(jobID: str | int, flag: str)
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[0], "AccountedFlag")) == "False"
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[1], "AccountedFlag")) == "False"
-
-    method = JobStateUpdateClient().setJobFlag
-    test_func1 = partial(method, example_jobids[0], "AccountedFlag")
-    test_func2 = partial(method, example_jobids[1], "AccountedFlag")
-    compare_results2(monkeypatch, test_func1, test_func2)
-
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[0], "AccountedFlag")) == "True"
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[1], "AccountedFlag")) == "True"
-
-
-def test_unsetJobFlag(monkeypatch, example_jobids):
-    # JobStateUpdateClient().unsetJobFlag(jobID: str | int, flag: str)
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[0], "AccountedFlag")) == "False"
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[1], "AccountedFlag")) == "False"
-
-    method = JobStateUpdateClient().setJobFlag
-    test_func1 = partial(method, example_jobids[0], "AccountedFlag")
-    test_func2 = partial(method, example_jobids[1], "AccountedFlag")
-    compare_results2(monkeypatch, test_func1, test_func2)
-
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[0], "AccountedFlag")) == "True"
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[1], "AccountedFlag")) == "True"
-
-    method = JobStateUpdateClient().unsetJobFlag
-    test_func1 = partial(method, example_jobids[0], "AccountedFlag")
-    test_func2 = partial(method, example_jobids[1], "AccountedFlag")
-    compare_results2(monkeypatch, test_func1, test_func2)
-
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[0], "AccountedFlag")) == "False"
-    assert returnValueOrRaise(JobMonitoringClient().getJobAttribute(example_jobids[1], "AccountedFlag")) == "False"
-
-
 @pytest.mark.parametrize(
     "args",
     [

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

@@ -293,10 +293,6 @@ def test_JobStateUpdateAndJobMonitoring() -> None:
         assert res["OK"], res["Message"]
         res = jobStateUpdateClient.setJobApplicationStatus(jobID, "app status", "source")
         assert res["OK"], res["Message"]
-        # res = jobStateUpdate.setJobFlag()
-        # self.assertTrue(res['OK'], res.get('Message'))
-        # res = jobStateUpdate.unsetJobFlag()
-        # self.assertTrue(res['OK'], res.get('Message'))
         res = jobStateUpdateClient.setJobSite(jobID, "Site")
         assert res["OK"], res["Message"]