From: Sage Weil <sage@redhat.com>
Date: Fri, 2 Jun 2017 14:05:08 +0000 (-0400)
Subject: mgr/PyState: add get_mgr_id() to module interface
X-Git-Tag: v12.1.0~213^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7cfbc2bd5cb510834280c998a3fd0b63712f88c;p=ceph.git

mgr/PyState: add get_mgr_id() to module interface

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/PyState.cc b/src/mgr/PyState.cc
index 1635f761d6c7..0b99e684ae81 100644
--- a/src/mgr/PyState.cc
+++ b/src/mgr/PyState.cc
@@ -186,6 +186,12 @@ ceph_get_server(PyObject *self, PyObject *args)
   }
 }
 
+static PyObject*
+ceph_get_mgr_id(PyObject *self, PyObject *args)
+{
+  return PyString_FromString(g_conf->name.get_id().c_str());
+}
+
 static PyObject*
 ceph_config_get(PyObject *self, PyObject *args)
 {
@@ -313,6 +319,8 @@ PyMethodDef CephStateMethods[] = {
      "Get a service's metadata"},
     {"send_command", ceph_send_command, METH_VARARGS,
      "Send a mon command"},
+    {"get_mgr_id", ceph_get_mgr_id, METH_NOARGS,
+     "Get the mgr id"},
     {"get_config", ceph_config_get, METH_VARARGS,
      "Get a configuration value"},
     {"set_config", ceph_config_set, METH_VARARGS,
diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 20a893a9e6bb..03f642e0577a 100644
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -165,6 +165,14 @@ class MgrModule(object):
         # any ``COMMANDS``
         raise NotImplementedError()
 
+    def get_mgr_id(self):
+        """
+        Retrieve the mgr id.
+
+        :return: str
+        """
+        return ceph_state.get_mgr_id()
+
     def get_config(self, key):
         """
         Retrieve the value of a persistent configuration setting