import 15.2.5

[ceph.git] / ceph / src / pybind / mgr / dashboard / controllers / mgr_modules.py

diff --git a/ceph/src/pybind/mgr/dashboard/controllers/mgr_modules.py b/ceph/src/pybind/mgr/dashboard/controllers/mgr_modules.py
index 6b8613497103fd1a5303587122f3ad08caae97b1..0d4cc5222560c54a9708a654212d11cd35dea42d 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/controllers/mgr_modules.py
+++ b/ceph/src/pybind/mgr/dashboard/controllers/mgr_modules.py
@@ -158,12 +158,13 @@ class MgrModules(RESTController):
                 else:
                     option['default_value'] = str_to_bool(
                         option['default_value'])
-            elif option['type'] == 'float':
+            elif option['type'] in ['float', 'uint', 'int', 'size', 'secs']:
+                cls = {
+                    'float': float
+                }.get(option['type'], int)
                 for name in ['default_value', 'min', 'max']:
-                    if option[name]:  # Skip empty entries
-                        option[name] = float(option[name])
-            elif option['type'] in ['uint', 'int', 'size', 'secs']:
-                for name in ['default_value', 'min', 'max']:
-                    if option[name]:  # Skip empty entries
-                        option[name] = int(option[name])
+                    if option[name] == 'None':  # This is Python None
+                        option[name] = None
+                    elif option[name]:  # Skip empty entries
+                        option[name] = cls(option[name])
         return options