Skip to content
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

[sweep:integration] fix: show status SysAdminCLI #7280

Merged
merged 1 commit into from
Nov 7, 2023
Merged

[sweep:integration] fix: show status SysAdminCLI #7280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/DIRAC/Core/Base/Client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ def addFunctions(clientCls):

# loop over all the nodes (classes, functions, imports) in the handlerModule
for node in ast.iter_child_nodes(handlerAst):
# find only a class with the name of the handlerClass
if not (isinstance(node, ast.ClassDef) and node.name == handlerClassName):
# find only a class that starts with the name of the handlerClass
if not (isinstance(node, ast.ClassDef) and node.name.startswith(handlerClassName)):
continue
for member in ast.iter_child_nodes(node):
# only look at functions
Expand Down
14 changes: 10 additions & 4 deletions src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@
from DIRAC.Core.Utilities.PrettyPrint import printTable
from DIRAC.Core.Utilities.PromptUser import promptUser
from DIRAC.FrameworkSystem.Client.ComponentInstaller import gComponentInstaller
from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient
from DIRAC.FrameworkSystem.Client.SystemAdministratorClient import SystemAdministratorClient
from DIRAC.FrameworkSystem.Client.SystemAdministratorIntegrator import SystemAdministratorIntegrator
from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import (
ComponentMonitoringClient,
)
from DIRAC.FrameworkSystem.Client.SystemAdministratorClient import (
SystemAdministratorClient,
)
from DIRAC.FrameworkSystem.Client.SystemAdministratorIntegrator import (
SystemAdministratorIntegrator,
)
from DIRAC.FrameworkSystem.Utilities import MonitoringUtilities
from DIRAC.MonitoringSystem.Client.MonitoringClient import MonitoringClient

Expand Down Expand Up @@ -199,7 +205,7 @@ def do_show(self, args):
for component in components:
record = []
if rDict[compType][system][component]["Installed"]:
module = str(rDict[compType][system][component]["DIRACModule"])
module = str(rDict[compType][system][component]["Module"])
record += [system, component, module, compType.lower()[:-1]]
if rDict[compType][system][component]["Setup"]:
record += ["Setup"]
Expand Down
Loading