refactor: adapt ResourceStatus/SiteStatus consumers to binary model

[HeloiseJoffe]

closes #8686

BEGINRELEASENOTES
*ResourceStatusSystem
CHANGE: adapt ResourceStatus/SiteStatus consumers to binary model
ENDRELEASENOTES

[fstagni]

Hi, this one LGTM. At the same time there are some failing tests in the backward compatibility:

https://github.com/DIRACGrid/DIRAC/actions/runs/31604149176/job/94138661798?pr=8738#step:13:359 :

LocalRepo/TestCode/DIRAC/tests/Integration/ResourceStatusSystem/Test_ResourceStatus.py::test_getElementStatus FAILED [100%]

=================================== FAILURES ===================================
____________________________ test_getElementStatus _____________________________

rssClient = <DIRAC.ResourceStatusSystem.Client.ResourceStatusClient.ResourceStatusClient object at 0x7f532e5434d0>
rsClient = <DIRAC.ResourceStatusSystem.Client.ResourceStatus.ResourceStatus object at 0x7f532e47a610>

    def test_getElementStatus(rssClient: ResourceStatusClient, rsClient):
        # make sure that the test resoureces are not presented in the db
        rssClient.deleteStatusElement("Resource", "Status", "testActiveResource")
        rssClient.deleteStatusElement("Resource", "Status", "testBannedResource")
        rssClient.deleteStatusElement("Resource", "Status", "testResource")
    
        res = rssClient.insertStatusElement(
            "Resource",
            "Status",
            "testActiveResource",
            "all",
            "Degraded",
            "ComputingElement",
            "reason",
            Datetime,
            Datetime,
            "tokenOwner",
            Datetime,
        )
    
        assert res["OK"] is True, res["Message"]
        rsClient.rssCache.refreshCache()
    
        res = rsClient.getElementStatus("testActiveResource", "ComputingElement")
    
        assert res["OK"] is True, res["Message"]
>       assert res["Value"]["testActiveResource"]["all"] == "Active"
E       AssertionError: assert 'Degraded' == 'Active'
E         
E         - Active
E         + Degraded

and https://github.com/DIRACGrid/DIRAC/actions/runs/31604149176/job/94138661798?pr=8738#step:13:491

LocalRepo/TestCode/DIRAC/tests/Integration/ResourceStatusSystem/Test_SiteStatus.py::test_addAndRemove_complicatedTest FAILED [100%]

=================================== FAILURES ===================================
______________________ test_addAndRemove_complicatedTest _______________________

stClient = <DIRAC.ResourceStatusSystem.Client.SiteStatus.SiteStatus object at 0x7fa47b1ff710>

    def test_addAndRemove_complicatedTest(stClient):
        rsClient = ResourceStatusClient()
        result = rsClient.insertStatusElement(
            "Site",
            "Status",
            "testActive.test.test",
            "all",
            "Active",
            "Site",
            "Synchronized",
            Datetime,
            Datetime,
            "tokenOwner",
            Datetime,
        )
        assert result["OK"] is True, result["Message"]
    
        result = rsClient.insertStatusElement(
            "Site",
            "Status",
            "testActive1.test.test",
            "all",
            "Active",
            "Site",
            "Synchronized",
            Datetime,
            Datetime,
            "tokenOwner",
            Datetime,
        )
        assert result["OK"] is True, result["Message"]
    
        result = rsClient.insertStatusElement(
            "Site",
            "Status",
            "testBanned.test.test",
            "all",
            "Banned",
            "Site",
            "Synchronized",
            Datetime,
            Datetime,
            "tokenOwner",
            Datetime,
        )
        assert result["OK"] is True, result["Message"]
        stClient.rssCache.refreshCache()
    
        # TEST getSites
        # ...............................................................................
    
        result = stClient.getSites()
        assert result["OK"] is True, result["Message"]
        inRSS = "testActive.test.test" in result["Value"]
    
        # TEST getSites
        # ...............................................................................
    
        result = stClient.getSites("all")
        assert result["OK"] is True, result["Message"]
    
        # TEST getUsableSites
        # ...............................................................................
    
        result = stClient.getUsableSites()
        assert result["OK"] is True, result["Message"]
    
        # setting a status
        if inRSS:
            result = stClient.setSiteStatus("testActive.test.test", "Probing")
            assert result["OK"] is True, result["Message"]
            stClient.rssCache.refreshCache()
    
            result = stClient.getSites("Banned")
            assert result["OK"] is True, result["Message"]
>           assert "testActive.test.test" in result["Value"]
E           AssertionError: assert 'testActive.test.test' in ['testBanned.test.test']

LocalRepo/TestCode/DIRAC/tests/Integration/ResourceStatusSystem/Test_SiteStatus.py:157: AssertionError

These are testing that a client of DIRAC version v9.0.X can talk with a server with version v9.1.X (this version).

[aldbr]

There are other places that would need to be checked:

• The if, elif blocks should likely disappear (we should not gate the writing part anymore):

  DIRAC/src/DIRAC/DataManagementSystem/scripts/dirac_admin_ban_se.py

  Lines 116 to 125 in 36806a1

  	if seOptions["ReadAccess"] == "Banned":
  	gLogger.notice("Read access already banned", se)
  	resR["OK"] = True
  	elif not seOptions["ReadAccess"] in ["Active", "Degraded", "Probing", "Error"]:
  	gLogger.notice(
  	"Read option for %s is %s, instead of %s"
  	% (se, seOptions["ReadAccess"], ["Active", "Degraded", "Probing", "Error"])
  	)
  	gLogger.notice("Try specifying the command switches")
  	else:

DIRAC/src/DIRAC/DataManagementSystem/scripts/dirac_admin_ban_se.py

Lines 135 to 144 in 36806a1

	if write and "WriteAccess" in seOptions:
	if seOptions["WriteAccess"] == "Banned":
	gLogger.notice("Write access already banned", se)
	resW["OK"] = True
	elif not seOptions["WriteAccess"] in ["Active", "Degraded", "Probing"]:
	gLogger.notice(
	"Write option for %s is %s, instead of %s"
	% (se, seOptions["WriteAccess"], ["Active", "Degraded", "Probing"])
	)
	gLogger.notice("Try specifying the command switches")

DIRAC/src/DIRAC/DataManagementSystem/scripts/dirac_admin_ban_se.py

Lines 155 to 165 in 36806a1

	if check and "CheckAccess" in seOptions:
	if seOptions["CheckAccess"] == "Banned":
	gLogger.notice("Check access already banned", se)
	resC["OK"] = True
	elif not seOptions["CheckAccess"] in ["Active", "Degraded", "Probing"]:
	gLogger.notice(
	"Check option for %s is %s, instead of %s"
	% (se, seOptions["CheckAccess"], ["Active", "Degraded", "Probing"])
	)
	gLogger.notice("Try specifying the command switches")
	else:

• Same here:
  

  DIRAC/src/DIRAC/DataManagementSystem/scripts/dirac_admin_allow_se.py

  Lines 125 to 136 in 36806a1

  	if statusFlagDict[statusType]:
  	if seOptions.get(statusType) == "Active":
  	gLogger.notice(f"{statusType} status of {se} is already Active")
  	continue
  	if statusType in seOptions:
  	if not seOptions[statusType] in ALLOWED_STATUSES:
  	gLogger.notice(
  	"%s option for %s is %s, instead of %s"
  	% (statusType, se, seOptions["ReadAccess"], ALLOWED_STATUSES)
  	)
  	gLogger.notice("Try specifying the command switches")
  	else:

[aldbr]

Just wondering: isn't it equivalent to getSites("Active") now?
What about just calling it inside getUsableSites?

[HeloiseJoffe]

They're only equivalent when siteNames is None. Otherwise getUsableSites filters within the given site list, while getSites has no siteNames param and always looks at all sites.