API: libcrmcommon: New PCMK_ROLE_STARTED string constant

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

include/crm/common/roles.h

@@ -23,6 +23,7 @@ extern "C" {
 // String equivalents of enum rsc_role_e
 
 #define PCMK_ROLE_STOPPED       "Stopped"
+#define PCMK_ROLE_STARTED       "Started"
 
 /*!
  * Possible roles that a resource can be in

include/crm/common/roles_internal.h

@@ -16,7 +16,6 @@ extern "C" {
 
 // String equivalents of enum rsc_role_e
 #define PCMK__ROLE_UNKNOWN      "Unknown"
-#define PCMK__ROLE_STARTED      "Started"
 #define PCMK__ROLE_UNPROMOTED   "Unpromoted"
 #define PCMK__ROLE_PROMOTED     "Promoted"
 #define PCMK__ROLE_UNPROMOTED_LEGACY    "Slave"

lib/common/roles.c

@@ -27,7 +27,7 @@ pcmk_role_text(enum rsc_role_e role)
             return PCMK_ROLE_STOPPED;
 
         case pcmk_role_started:
-            return PCMK__ROLE_STARTED;
+            return PCMK_ROLE_STARTED;
 
         case pcmk_role_unpromoted:
 #ifdef PCMK__COMPAT_2_0
@@ -63,7 +63,7 @@ pcmk_parse_role(const char *role)
         return pcmk_role_unknown;
     } else if (pcmk__str_eq(role, PCMK_ROLE_STOPPED, pcmk__str_casei)) {
         return pcmk_role_stopped;
-    } else if (pcmk__str_eq(role, PCMK__ROLE_STARTED, pcmk__str_casei)) {
+    } else if (pcmk__str_eq(role, PCMK_ROLE_STARTED, pcmk__str_casei)) {
         return pcmk_role_started;
     } else if (pcmk__strcase_any_of(role, PCMK__ROLE_UNPROMOTED,
                                     PCMK__ROLE_UNPROMOTED_LEGACY, NULL)) {

lib/pacemaker/pcmk_sched_colocation.c

@@ -369,12 +369,12 @@ pcmk__new_colocation(const char *id, const char *node_attr, int score,
 
     new_con = pcmk__assert_alloc(1, sizeof(pcmk__colocation_t));
 
-    if (pcmk__str_eq(dependent_role, PCMK__ROLE_STARTED,
+    if (pcmk__str_eq(dependent_role, PCMK_ROLE_STARTED,
                      pcmk__str_null_matches|pcmk__str_casei)) {
         dependent_role = PCMK__ROLE_UNKNOWN;
     }
 
-    if (pcmk__str_eq(primary_role, PCMK__ROLE_STARTED,
+    if (pcmk__str_eq(primary_role, PCMK_ROLE_STARTED,
                      pcmk__str_null_matches|pcmk__str_casei)) {
         primary_role = PCMK__ROLE_UNKNOWN;
     }

lib/pacemaker/pcmk_sched_tickets.c

@@ -160,7 +160,7 @@ rsc_ticket_new(const char *id, pcmk_resource_t *rsc, pcmk_ticket_t *ticket,
         return;
     }
 
-    if (pcmk__str_eq(state, PCMK__ROLE_STARTED,
+    if (pcmk__str_eq(state, PCMK_ROLE_STARTED,
                      pcmk__str_null_matches|pcmk__str_casei)) {
         state = PCMK__ROLE_UNKNOWN;
     }

lib/pengine/complex.c

@@ -277,7 +277,7 @@ template_op_key(xmlNode * op)
     char *key = NULL;
 
     if ((role == NULL)
-        || pcmk__strcase_any_of(role, PCMK__ROLE_STARTED, PCMK__ROLE_UNPROMOTED,
+        || pcmk__strcase_any_of(role, PCMK_ROLE_STARTED, PCMK__ROLE_UNPROMOTED,
                                 PCMK__ROLE_UNPROMOTED_LEGACY, NULL)) {
         role = PCMK__ROLE_UNKNOWN;
     }

tools/crm_resource_ban.c

@@ -92,7 +92,7 @@ cli_resource_ban(pcmk__output_t *out, const char *rsc_id, const char *host,
     if(promoted_role_only) {
         crm_xml_add(location, PCMK_XA_ROLE, promoted_role);
     } else {
-        crm_xml_add(location, PCMK_XA_ROLE, PCMK__ROLE_STARTED);
+        crm_xml_add(location, PCMK_XA_ROLE, PCMK_ROLE_STARTED);
     }
 
     if (later_s == NULL) {
@@ -169,7 +169,7 @@ cli_resource_prefer(pcmk__output_t *out,const char *rsc_id, const char *host,
     if(promoted_role_only) {
         crm_xml_add(location, PCMK_XA_ROLE, promoted_role);
     } else {
-        crm_xml_add(location, PCMK_XA_ROLE, PCMK__ROLE_STARTED);
+        crm_xml_add(location, PCMK_XA_ROLE, PCMK_ROLE_STARTED);
     }
 
     if (later_s == NULL) {