Merge pull request #6892 from fstagni/80_fixes50

[8.0] fix for show installations

Author: fstagni

docs/source/AdministratorGuide/ExternalsSupport/index.rst

@@ -9,7 +9,7 @@ OS
 
 DIRAC needs `DIRACOS <https://github.com/DIRACGrid/DIRACOS2/releases>`_ for its dependencies. DIRACOS includes all dependencies (except for glibc), including Python and Grid middleware.
 
-DIRAC *client* installation is supported for all x86_64 Linux installations using `DIRACOS <https://github.com/DIRACGrid/DIRACOS2/releases>`_. This includes installations made by the pilots.
+DIRAC *client* installation is supported for all x86_64, aarch64, ppc64le Linux and Darwin installations using `DIRACOS <https://github.com/DIRACGrid/DIRACOS2/releases>`_. This includes installations made by the pilots.
 
 DIRAC *server* installation is supported for *most* x86_64 Linux installations using `DIRACOS <https://github.com/DIRACGrid/DIRACOS2/releases>`_. Other architectures and platforms may work as a server installation, however this is on a best effort basis and is not regularly tested.
 
@@ -44,7 +44,7 @@ ElasticSearch versions
 
 ElasticSearch is an optional dependency for DIRAC servers installations. Supported versions:
 
-- 7.x
+- 7.x up until 7.13
 - OpenDistro and OpenSearch releases "compatible" with the above ElasticSearch versions.
 
 ElasticSearch server is not shipped with DIRAC. You are responsible of its administration.

src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py

@@ -198,7 +198,7 @@ def do_show(self, args):
                         for component in components:
                             record = []
                             if rDict[compType][system][component]["Installed"]:
-                                module = str(rDict[compType][system][component]["Module"])
+                                module = str(rDict[compType][system][component]["DIRACModule"])
                                 record += [system, component, module, compType.lower()[:-1]]
                                 if rDict[compType][system][component]["Setup"]:
                                     record += ["Setup"]
@@ -213,7 +213,7 @@ def do_show(self, args):
                                 record += [str(rDict[compType][system][component]["PID"])]
                                 records.append(record)
                 printTable(fields, records)
-        elif option == "database" or option == "databases":
+        elif option in ("database", "databases"):
             client = SystemAdministratorClient(self.host, self.port)
             if not gComponentInstaller.mysqlPassword:
                 gComponentInstaller.mysqlPassword = "LocalConfig"
@@ -457,9 +457,9 @@ def getInstallations(self, argss):
                 elif arg == "-t":
                     key = "Component.Type"
                 elif arg == "-m":
-                    key = "Component.Module"
+                    key = "Component.DIRACModule"
                 elif arg == "-s":
-                    key = "Component.System"
+                    key = "Component.DIRACSystem"
                 elif arg == "-h":
                     key = "Host.HostName"
                 elif arg == "-n":