From 1eaf0d333184547b7edd4561786b77dadd838387 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Feb 24 2021 16:09:00 +0000
Subject: Fix: crmadmin: use cluster instead of member term and remove pacemaker_remote node type


---

diff --git a/include/pacemaker.h b/include/pacemaker.h
index 42d096f..a6a9d13 100644
--- a/include/pacemaker.h
+++ b/include/pacemaker.h
@@ -77,6 +77,7 @@ int pcmk_resource_digests(xmlNodePtr *xml, pe_resource_t *rsc,
  * \brief Get nodes list
  *
  * \param[in,out] xml                The destination for the result, as an XML tree.
+ * \param[in]     node_types         Node type(s) to return (default: all)
  *
  * \return Standard Pacemaker return code
  */
diff --git a/lib/pacemaker/pcmk_cluster_queries.c b/lib/pacemaker/pcmk_cluster_queries.c
index e512f32..9f19915 100644
--- a/lib/pacemaker/pcmk_cluster_queries.c
+++ b/lib/pacemaker/pcmk_cluster_queries.c
@@ -448,11 +448,10 @@ pcmk__list_nodes(pcmk__output_t *out, char *node_types, gboolean BASH_EXPORT)
             node_types = NULL;
         }
 
-        if (pcmk__str_empty(node_types) || strstr(node_types, "member")) {
+        if (pcmk__str_empty(node_types) || strstr(node_types, "cluster")) {
             for (node = first_named_child(nodes, XML_CIB_TAG_NODE); node != NULL;
                  node = crm_next_same_xml(node)) {
                 const char *node_type = crm_element_value(node, XML_ATTR_TYPE);
-                //if (node_type == NULL || !strcmp(node_type, "member")) {
                 if (node_type == NULL) {
                     out->message(out, "crmadmin-node", node_type,
                                  crm_str(crm_element_value(node, XML_ATTR_UNAME)),
@@ -464,13 +463,6 @@ pcmk__list_nodes(pcmk__output_t *out, char *node_types, gboolean BASH_EXPORT)
             }
         }
 
-        if (pcmk__str_empty(node_types) || strstr(node_types, "pacemaker_remote")) {
-            data.field = "id";
-            data.type = "pacemaker_remote";
-            crm_foreach_xpath_result(xml_node, PCMK__XP_REMOTE_NODE_STATUS,
-                                     remote_node_print_helper, &data);
-        }
-
         if (pcmk__str_empty(node_types) || strstr(node_types, "guest")) {
             data.field = "value";
             data.type = "guest";
diff --git a/lib/pacemaker/pcmk_output.c b/lib/pacemaker/pcmk_output.c
index 8f5e301..655b723 100644
--- a/lib/pacemaker/pcmk_output.c
+++ b/lib/pacemaker/pcmk_output.c
@@ -483,7 +483,7 @@ crmadmin_node_text(pcmk__output_t *out, va_list args)
     } else if (BASH_EXPORT) {
         out->info(out, "export %s=%s", crm_str(name), crm_str(id));
     } else {
-        out->info(out, "%s node: %s (%s)", type ? type : "member",
+        out->info(out, "%s node: %s (%s)", type ? type : "cluster",
                   crm_str(name), crm_str(id));
     }
 
@@ -499,7 +499,7 @@ crmadmin_node_xml(pcmk__output_t *out, va_list args)
     const char *id = va_arg(args, const char *);
 
     pcmk__output_create_xml_node(out, "node",
-                                 "type", type ? type : "member",
+                                 "type", type ? type : "cluster",
                                  "name", crm_str(name),
                                  "id", crm_str(id),
                                  NULL);
diff --git a/tools/crmadmin.c b/tools/crmadmin.c
index 3f31c69..d699786 100644
--- a/tools/crmadmin.c
+++ b/tools/crmadmin.c
@@ -96,8 +96,8 @@ static GOptionEntry additional_options[] = {
       NULL
     },
     { "node-types", 'T', 0, G_OPTION_ARG_STRING, &options.node_types,
-      "Node types to list (available options: all, member, pacemaker_remote,"
-      "\n                          guest, remote) (valid with -N/--nodes)",
+      "Node types to list (available options: all, cluster, guest, remote)"
+      "\n                          (valid with -N/--nodes)",
       NULL
     },
     { "bash-export", 'B', 0, G_OPTION_ARG_NONE, &options.BASH_EXPORT,