From: John Spray <john.spray@redhat.com>
Date: Mon, 16 Apr 2018 09:37:50 +0000 (-0400)
Subject: mgr/restful: migrate to new get_store interface
X-Git-Tag: v13.1.0~143^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54e5cef23400752add1bfa7cb05ff1599110720f;p=ceph.git

mgr/restful: migrate to new get_store interface

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

diff --git a/src/pybind/mgr/restful/module.py b/src/pybind/mgr/restful/module.py
index ecae22100d18..e1b76aa3c75e 100644
--- a/src/pybind/mgr/restful/module.py
+++ b/src/pybind/mgr/restful/module.py
@@ -263,7 +263,7 @@ class Module(MgrModule):
 
     def refresh_keys(self):
         self.keys = {}
-        rawkeys = self.get_config_prefix('keys/') or {}
+        rawkeys = self.get_store_prefix('keys/') or {}
         for k, v in iteritems(rawkeys):
             self.keys[k[5:]] = v  # strip of keys/ prefix
 
@@ -285,16 +285,16 @@ class Module(MgrModule):
         self.log.info('server_addr: %s server_port: %d',
                       server_addr, server_port)
 
-        cert = self.get_localized_config("crt")
+        cert = self.get_localized_store("crt")
         if cert is not None:
             cert_tmp = tempfile.NamedTemporaryFile()
             cert_tmp.write(cert.encode('utf-8'))
             cert_tmp.flush()
             cert_fname = cert_tmp.name
         else:
-            cert_fname = self.get_localized_config('crt_file')
+            cert_fname = self.get_localized_store('crt_file')
 
-        pkey = self.get_localized_config("key")
+        pkey = self.get_localized_store("key")
         if pkey is not None:
             pkey_tmp = tempfile.NamedTemporaryFile()
             pkey_tmp.write(pkey.encode('utf-8'))
@@ -408,7 +408,7 @@ class Module(MgrModule):
             else:
                 key = str(uuid4())
                 self.keys[command['key_name']] = key
-                self.set_config('keys/' + command['key_name'], key)
+                self.set_store('keys/' + command['key_name'], key)
 
             return (
                 0,
@@ -419,7 +419,7 @@ class Module(MgrModule):
         elif command['prefix'] == "restful delete-key":
             if command['key_name'] in self.keys:
                 del self.keys[command['key_name']]
-                self.set_config('keys/' + command['key_name'], None)
+                self.set_store('keys/' + command['key_name'], None)
 
             return (
                 0,
@@ -437,8 +437,8 @@ class Module(MgrModule):
 
         elif command['prefix'] == "restful create-self-signed-cert":
             cert, pkey = self.create_self_signed_cert()
-            self.set_config(self.get_mgr_id() + '/crt', cert.decode('utf-8'))
-            self.set_config(self.get_mgr_id() + '/key', pkey.decode('utf-8'))
+            self.set_store(self.get_mgr_id() + '/crt', cert.decode('utf-8'))
+            self.set_store(self.get_mgr_id() + '/key', pkey.decode('utf-8'))
 
             self.restart()
             return (