Merge pull request #1381 from liangxin1300/20240407_corosync_status_cpg

Dev: corosync: Show corosync cpg status in `crm corosync status cpg`

Author: liangxin1300

crmsh/constants.py

@@ -516,6 +516,8 @@
 If a nic name is provided, the first IP of that nic will be used. 
 Use multiple -i for more links. Note: Only one link is allowed for the non knet transport type
 """
+
 NON_FUNCTIONAL_COMMANDS = {'help', 'cd', 'ls', 'quit', 'up'}
 NON_FUNCTIONAL_OPTIONS = {'--help', '--help-without-redirect'}
+COROSYNC_STATUS_TYPES = ("ring", "quorum", "qdevice", "qnetd", "cpg")
 # vim:ts=4:sw=4:et:

crmsh/corosync.py

@@ -96,13 +96,14 @@ def query_status(status_type):
     """
     Query status of corosync
 
-    Possible types could be ring/quorum/qdevice/qnetd
+    Possible types could be ring/quorum/qdevice/qnetd/cpg
     """
     status_func_dict = {
             "ring": query_ring_status,
             "quorum": query_quorum_status,
             "qdevice": query_qdevice_status,
-            "qnetd": query_qnetd_status
+            "qnetd": query_qnetd_status,
+            "cpg": query_cpg_status
             }
     if status_type in status_func_dict:
         out = sh.cluster_shell().get_stdout_or_raise_error("crm_node -l")
@@ -168,6 +169,14 @@ def query_qnetd_status():
         return utils.to_ascii(qnetd_result_stdout)
 
 
+def query_cpg_status():
+    """
+    Query corosync cpg status
+    """
+    cmd = "corosync-cpgtool -e"
+    return sh.cluster_shell().get_stdout_or_raise_error(cmd)
+
+
 def push_configuration(nodes):
     '''
     Push the local configuration to the list of remote nodes

crmsh/ui_corosync.py

@@ -9,6 +9,7 @@
 from . import parallax
 from . import bootstrap
 from . import log
+from . import constants
 from .service_manager import ServiceManager
 
 logger = log.setup_logger(__name__)
@@ -57,7 +58,7 @@ class Corosync(command.UI):
     def requires(self):
         return corosync.check_tools()
 
-    @command.completers(completers.choice(['ring', 'quorum', 'qdevice', 'qnetd']))
+    @command.completers(completers.choice(constants.COROSYNC_STATUS_TYPES))
     def do_status(self, context, status_type="ring"):
         '''
         Quick cluster health status. Corosync status or QNetd status

doc/crm.8.adoc

@@ -1372,11 +1372,11 @@ show
 [[cmdhelp_corosync_status,Display the corosync status]]
 ==== `status`
 
-Displays the corosync ring status(default), also can display quorum/qdevice/qnetd status.
+Displays the corosync ring status(default), also can display quorum/qdevice/qnetd/cpg status.
 
 Usage:
 .........
-status [ring|quorum|qdevice|qnetd]
+status [ring|quorum|qdevice|qnetd|cpg]
 .........
 
 [[cmdhelp_cib,CIB shadow management]]