mgr: remove unused [get|set]_store_json fns

These were little used helpers, now totally unused!

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/doc/mgr/plugins.rst b/doc/mgr/plugins.rst
index 8cfab3520fca107d59ccf8f1a7041ed39d18fd5c..8e67819e010d69afcc5ed2f34288b302d821c56c 100644 (file)
--- a/doc/mgr/plugins.rst
+++ b/doc/mgr/plugins.rst
@@ -157,8 +157,6 @@ a particular prefix (i.e. all keys starting with a particular substring).
 
 .. automethod:: MgrModule.get_store
 .. automethod:: MgrModule.set_store
-.. automethod:: MgrModule.set_store_json
-.. automethod:: MgrModule.get_store_json
 .. automethod:: MgrModule.get_localized_store
 .. automethod:: MgrModule.set_localized_store
 .. automethod:: MgrModule.get_store_prefix

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 1db2e71a425e39db33fc903fd8c6bfbf6f4f0ff1..5856836ae560e67df17283b582d230a6db05c9d4 100644 (file)
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -622,28 +622,6 @@ class MgrModule(ceph_module.BaseMgrModule):
         self._validate_option(key)
         return self._set_localized(key, val, self._set_config)
 
-    def set_store_json(self, key, val):
-        """
-        Helper for setting json-serialized stored data
-
-        :param str key:
-        :param val: json-serializable object
-        """
-        self.set_store(key, json.dumps(val))
-
-    def get_store_json(self, key):
-        """
-        Helper for getting json-serialized stored data
-
-        :param str key:
-        :return: object
-        """
-        raw = self.get_store(key)
-        if raw is None:
-            return None
-        else:
-            return json.loads(raw)
-
     def set_store(self, key, val):
         """
         Set a value in this module's persistent key value store

diff --git a/src/pybind/mgr/selftest/module.py b/src/pybind/mgr/selftest/module.py
index dfc57ae5c2bfdbf57e46125a33775651270b70c4..4b5d703d7262ff6144c9eca8bb57898a6695e285 100644 (file)
--- a/src/pybind/mgr/selftest/module.py
+++ b/src/pybind/mgr/selftest/module.py
@@ -163,11 +163,8 @@ class Module(MgrModule):
         self.set_store("testkey", "testvalue")
         assert self.get_store("testkey") == "testvalue"
 
-        self.set_store_json("testjsonkey", {"testblob": 2})
-        assert self.get_store_json("testjsonkey") == {"testblob": 2}
-
         assert sorted(self.get_store_prefix("test").keys()) == sorted(
-                list({"testkey", "testjsonkey"} | existing_keys))
+                list({"testkey"} | existing_keys))
 
 
     def _self_test_perf_counters(self):