|
2 | 2 | ########################################################################
|
3 | 3 | """ System Administrator Client Command Line Interface """
|
4 | 4 |
|
5 |
| -import sys |
6 |
| -import pprint |
7 |
| -import os |
8 | 5 | import atexit
|
9 |
| -import readline |
10 | 6 | import datetime
|
| 7 | +import os |
| 8 | +import pprint |
| 9 | +import readline |
| 10 | +import sys |
11 | 11 | import time
|
12 | 12 |
|
13 | 13 | from DIRAC import gConfig, gLogger
|
14 | 14 | from DIRAC.Core.Base.CLI import CLI, colorize
|
15 |
| -from DIRAC.FrameworkSystem.Client.SystemAdministratorClient import SystemAdministratorClient |
16 |
| -from DIRAC.FrameworkSystem.Client.SystemAdministratorIntegrator import SystemAdministratorIntegrator |
17 |
| -from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient |
18 |
| -from DIRAC.FrameworkSystem.Utilities import MonitoringUtilities |
19 |
| -from DIRAC.MonitoringSystem.Client.MonitoringClient import MonitoringClient |
20 |
| -from DIRAC.FrameworkSystem.Client.ComponentInstaller import gComponentInstaller |
21 |
| -from DIRAC.Core.Utilities.Extensions import extensionsByPriority |
| 15 | +from DIRAC.Core.Security.ProxyInfo import getProxyInfo |
22 | 16 | from DIRAC.Core.Utilities import List
|
23 |
| -from DIRAC.Core.Utilities.PromptUser import promptUser |
24 |
| -from DIRAC.Core.Utilities.PrettyPrint import printTable |
| 17 | +from DIRAC.Core.Utilities.Extensions import extensionsByPriority |
25 | 18 | from DIRAC.Core.Utilities.File import mkDir
|
26 |
| -from DIRAC.Core.Security.ProxyInfo import getProxyInfo |
| 19 | +from DIRAC.Core.Utilities.PrettyPrint import printTable |
| 20 | +from DIRAC.Core.Utilities.PromptUser import promptUser |
| 21 | +from DIRAC.FrameworkSystem.Client.ComponentInstaller import gComponentInstaller |
| 22 | +from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ( |
| 23 | + ComponentMonitoringClient, |
| 24 | +) |
| 25 | +from DIRAC.FrameworkSystem.Client.SystemAdministratorClient import ( |
| 26 | + SystemAdministratorClient, |
| 27 | +) |
| 28 | +from DIRAC.FrameworkSystem.Client.SystemAdministratorIntegrator import ( |
| 29 | + SystemAdministratorIntegrator, |
| 30 | +) |
| 31 | +from DIRAC.FrameworkSystem.Utilities import MonitoringUtilities |
| 32 | +from DIRAC.MonitoringSystem.Client.MonitoringClient import MonitoringClient |
27 | 33 |
|
28 | 34 |
|
29 | 35 | class SystemAdministratorClientCLI(CLI):
|
@@ -198,7 +204,7 @@ def do_show(self, args):
|
198 | 204 | for component in components:
|
199 | 205 | record = []
|
200 | 206 | if rDict[compType][system][component]["Installed"]:
|
201 |
| - module = str(rDict[compType][system][component]["DIRACModule"]) |
| 207 | + module = str(rDict[compType][system][component]["Module"]) |
202 | 208 | record += [system, component, module, compType.lower()[:-1]]
|
203 | 209 | if rDict[compType][system][component]["Setup"]:
|
204 | 210 | record += ["Setup"]
|
|
0 commit comments