diff --git a/include/pacemaker.h b/include/pacemaker.h index a1e76d0..b2a73cd 100644 --- a/include/pacemaker.h +++ b/include/pacemaker.h @@ -14,8 +14,6 @@ extern "C" { #endif -#ifdef BUILD_PUBLIC_LIBPACEMAKER - /** * \file * \brief High Level API @@ -26,6 +24,49 @@ extern "C" { # include /*! + * \brief Get controller status + * + * \param[in,out] xml The destination for the result, as an XML tree. + * \param[in] dest_node Destination node for request + * \param[in] message_timeout_ms Message timeout + * + * \return Standard Pacemaker return code + */ +int pcmk_controller_status(xmlNodePtr *xml, char *dest_node, unsigned int message_timeout_ms); + +/*! + * \brief Get designated controller + * + * \param[in,out] xml The destination for the result, as an XML tree. + * \param[in] message_timeout_ms Message timeout + * + * \return Standard Pacemaker return code + */ +int pcmk_designated_controller(xmlNodePtr *xml, unsigned int message_timeout_ms); + +/*! + * \brief Get pacemakerd status + * + * \param[in,out] xml The destination for the result, as an XML tree. + * \param[in] ipc_name IPC name for request + * \param[in] message_timeout_ms Message timeout + * + * \return Standard Pacemaker return code + */ +int pcmk_pacemakerd_status(xmlNodePtr *xml, char *ipc_name, unsigned int message_timeout_ms); + +#ifdef BUILD_PUBLIC_LIBPACEMAKER + +/*! + * \brief Get nodes list + * + * \param[in,out] xml The destination for the result, as an XML tree. + * + * \return Standard Pacemaker return code + */ +int pcmk_list_nodes(xmlNodePtr *xml); + +/*! * \brief Perform a STONITH action. * * \param[in] st A connection to the STONITH API. diff --git a/lib/pacemaker/pcmk_cluster_queries.c b/lib/pacemaker/pcmk_cluster_queries.c index 8d729eb..c705b7f 100644 --- a/lib/pacemaker/pcmk_cluster_queries.c +++ b/lib/pacemaker/pcmk_cluster_queries.c @@ -1,6 +1,7 @@ #include // gboolean, GMainLoop, etc. #include // xmlNode +#include #include #include @@ -282,6 +283,24 @@ pcmk__controller_status(pcmk__output_t *out, char *dest_node, guint message_time } int +pcmk_controller_status(xmlNodePtr *xml, char *dest_node, unsigned int message_timeout_ms) +{ + pcmk__output_t *out = NULL; + int rc = pcmk_rc_ok; + + rc = pcmk__out_prologue(&out, xml); + if (rc != pcmk_rc_ok) { + return rc; + } + + pcmk__register_lib_messages(out); + + rc = pcmk__controller_status(out, dest_node, (guint) message_timeout_ms); + pcmk__out_epilogue(out, xml, rc); + return rc; +} + +int pcmk__designated_controller(pcmk__output_t *out, guint message_timeout_ms) { data_t data = { @@ -309,6 +328,24 @@ pcmk__designated_controller(pcmk__output_t *out, guint message_timeout_ms) } int +pcmk_designated_controller(xmlNodePtr *xml, unsigned int message_timeout_ms) +{ + pcmk__output_t *out = NULL; + int rc = pcmk_rc_ok; + + rc = pcmk__out_prologue(&out, xml); + if (rc != pcmk_rc_ok) { + return rc; + } + + pcmk__register_lib_messages(out); + + rc = pcmk__designated_controller(out, (guint) message_timeout_ms); + pcmk__out_epilogue(out, xml, rc); + return rc; +} + +int pcmk__pacemakerd_status(pcmk__output_t *out, char *ipc_name, guint message_timeout_ms) { data_t data = { @@ -335,6 +372,24 @@ pcmk__pacemakerd_status(pcmk__output_t *out, char *ipc_name, guint message_timeo return data.rc; } +int +pcmk_pacemakerd_status(xmlNodePtr *xml, char *ipc_name, unsigned int message_timeout_ms) +{ + pcmk__output_t *out = NULL; + int rc = pcmk_rc_ok; + + rc = pcmk__out_prologue(&out, xml); + if (rc != pcmk_rc_ok) { + return rc; + } + + pcmk__register_lib_messages(out); + + rc = pcmk__pacemakerd_status(out, ipc_name, (guint) message_timeout_ms); + pcmk__out_epilogue(out, xml, rc); + return rc; +} + // \return Standard Pacemaker return code int pcmk__list_nodes(pcmk__output_t *out, gboolean BASH_EXPORT) @@ -361,6 +416,26 @@ pcmk__list_nodes(pcmk__output_t *out, gboolean BASH_EXPORT) return pcmk_legacy2rc(rc); } +#ifdef BUILD_PUBLIC_LIBPACEMAKER +int +pcmk_list_nodes(xmlNodePtr *xml) +{ + pcmk__output_t *out = NULL; + int rc = pcmk_rc_ok; + + rc = pcmk__out_prologue(&out, xml); + if (rc != pcmk_rc_ok) { + return rc; + } + + pcmk__register_lib_messages(out); + + rc = pcmk__list_nodes(out, FALSE); + pcmk__out_epilogue(out, xml, rc); + return rc; +} +#endif + // remove when parameters removed from tools/crmadmin.c int pcmk__shutdown_controller(pcmk__output_t *out, char *dest_node)