Skip to content

Commit 582b9c3

Browse files
committed
fix: adjusted RssConfiguration to simplified config
1 parent e8ff6d8 commit 582b9c3

File tree

2 files changed

+8
-28
lines changed

2 files changed

+8
-28
lines changed

src/DIRAC/ResourceStatusSystem/Utilities/InfoGetter.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
""" InfoGetter
1+
"""InfoGetter
22
3-
Module used to map the policies with the CS.
3+
Module used to map the policies with the CS.
44
55
"""
6+
67
import copy
78

89
from DIRAC import S_OK, S_ERROR, gConfig, gLogger
@@ -189,7 +190,7 @@ def _sanitizedecisionParams(decisionParams):
189190
def _getComputingElementsByDomainName(targetDomain=None):
190191
"""
191192
WARNING: TO ADD TO CSHelpers
192-
Gets all computing elements from /Resources/Sites/<>/<>/CE
193+
Gets all computing elements from /Resources/Sites/<domain>/<site_name>/CEs
193194
"""
194195

195196
_basePath = "Resources/Sites"

src/DIRAC/ResourceStatusSystem/Utilities/RssConfiguration.py

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ class RssConfiguration:
2020
{
2121
Config:
2222
{
23-
State : Active | InActive,
2423
Cache : 300,
2524
FromAddress : '[email protected]'
26-
StatusType :
25+
Policies
26+
{
27+
}
28+
PolicyActions
2729
{
28-
default : all,
29-
StorageElement: ReadAccess, WriteAccess, CheckAccess, RemoveAccess
3030
}
3131
}
3232
}
@@ -81,24 +81,3 @@ def getNotifications():
8181
"""
8282

8383
return Utils.getCSTree(f"{_rssConfigPath}/Notification")
84-
85-
86-
def getValidElements():
87-
"""
88-
Returns from the OperationsHelper: <_rssConfigPath>/GeneralConfig/ValidElements
89-
"""
90-
_DEFAULTS = ("Site", "Resource")
91-
92-
# result = Operations().getValue( '%s/GeneralConfig/ValidElements' % _rssConfigPath )
93-
# if result is not None:
94-
# return List.fromChar( result )
95-
return _DEFAULTS
96-
97-
98-
def getValidStatus():
99-
"""
100-
Returns a list of statuses as were defined on the RSS(State)Machine
101-
"""
102-
103-
validStatus = RSSMachine(None).getStates()
104-
return S_OK(validStatus)

0 commit comments

Comments
 (0)