]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/tests: _ceph_get_module_option returns proper type now.
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 17 Jun 2020 12:39:59 +0000 (14:39 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 25 Jun 2020 13:55:17 +0000 (15:55 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
src/pybind/mgr/tests/__init__.py

index 7bccfc79970887b7eec6339db736909aafe9be24..8c54c79e52606fd798e5cf6fdd6c4264e2f60b4e 100644 (file)
@@ -36,7 +36,17 @@ if 'UNITTEST' in os.environ:
             }
 
         def _ceph_get_module_option(self, module, key, localized_prefix: None):
-            return self._ceph_get_store(f'{module}/{key}')
+            val =  self._ceph_get_store(f'{module}/{key}')
+            mo = [o for o in self.MODULE_OPTIONS if o['name'] == key]
+            if len(mo) == 1 and val is not None:
+                cls = {
+                    'str': str,
+                    'secs': int,
+                    'bool': lambda s: bool(s) and s != 'false' and s != 'False',
+                    'int': int,
+                }[mo[0].get('type', 'str')]
+                return cls(val)
+            return val
 
         def _ceph_set_module_option(self, module, key, val):
             return self._ceph_set_store(f'{module}/{key}', val)