sweep: #7272 create client get functions from HandlerMixins

Merge pull request #7273 from DIRACGridBot/cherry-pick-2-6d71e45f6-integration
DIRACGrid · Nov 7, 2023 · 73d7d5f · 73d7d5f
1 parent 0b55787
commit 73d7d5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/DIRAC/Core/Base/Client.py b/src/DIRAC/Core/Base/Client.py
@@ -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

diff --git a/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py b/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py
@@ -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
 
@@ -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"]