mgr/dashboard: fix None value for ints and floats

Fixes: https://tracker.ceph.com/issues/45963
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/qa/tasks/mgr/dashboard/test_mgr_module.py b/qa/tasks/mgr/dashboard/test_mgr_module.py
index 3c24019d4934027e1f4cf0195f063d001fb13b98..39040d1a48c615df3653108fb226ca1dac695ad5 100644 (file)
--- a/qa/tasks/mgr/dashboard/test_mgr_module.py
+++ b/qa/tasks/mgr/dashboard/test_mgr_module.py
@@ -51,7 +51,7 @@ class MgrModuleTest(MgrModuleTestCase):
                             'type': str,
                             'level': str,
                             'flags': int,
-                            'default_value': JAny(none=False),
+                            'default_value': JAny(none=True),
                             'min': JAny(none=False),
                             'max': JAny(none=False),
                             'enum_allowed': JList(str),
@@ -85,7 +85,7 @@ class MgrModuleTest(MgrModuleTestCase):
                             'type': str,
                             'level': str,
                             'flags': int,
-                            'default_value': JAny(none=False),
+                            'default_value': JAny(none=True),
                             'min': JAny(none=False),
                             'max': JAny(none=False),
                             'enum_allowed': JList(str),

diff --git a/src/pybind/mgr/dashboard/controllers/mgr_modules.py b/src/pybind/mgr/dashboard/controllers/mgr_modules.py
index 6b8613497103fd1a5303587122f3ad08caae97b1..d296d17fbf3f057c77a15e558bfcf47e1731b974 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/mgr_modules.py
+++ b/src/pybind/mgr/dashboard/controllers/mgr_modules.py
@@ -160,10 +160,14 @@ class MgrModules(RESTController):
                         option['default_value'])
             elif option['type'] == 'float':
                 for name in ['default_value', 'min', 'max']:
-                    if option[name]:  # Skip empty entries
+                    if option[name] == 'None':  # This is Python None
+                        option[name] = None
+                    elif 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
+                    if option[name] == 'None':  # This is Python None
+                        option[name] = None
+                    elif option[name]:  # Skip empty entries
                         option[name] = int(option[name])
         return options