import 15.2.0 Octopus source

[ceph.git] / ceph / qa / tasks / mgr / dashboard / test_health.py

diff --git a/ceph/qa/tasks/mgr/dashboard/test_health.py b/ceph/qa/tasks/mgr/dashboard/test_health.py
index afc632a6cfa0c954dad7d152ecebc4672f9cd242..05732885deb161d65a64824817cdaf846cc9f503 100644 (file)
--- a/ceph/qa/tasks/mgr/dashboard/test_health.py
+++ b/ceph/qa/tasks/mgr/dashboard/test_health.py
@@ -54,11 +54,15 @@ class HealthTest(DashboardTestCase):
                 'standbys': JList(JObj({})),
             }),
             'health': JObj({
-                'checks': JList(str),
+                'checks': JList(JObj({}, allow_unknown=True)),
+                'mutes': JList(JObj({}, allow_unknown=True)),
                 'status': str,
             }),
             'hosts': int,
-            'iscsi_daemons': int,
+            'iscsi_daemons': JObj({
+                'up': int,
+                'down': int
+            }),
             'mgr_map': JObj({
                 'active_name': str,
                 'standbys': JList(JLeaf(dict))
@@ -120,9 +124,13 @@ class HealthTest(DashboardTestCase):
                 'pools': JList(JObj({
                     'stats': JObj({
                         'stored': int,
+                        'stored_data': int,
+                        'stored_omap': int,
                         'objects': int,
                         'kb_used': int,
                         'bytes_used': int,
+                        'data_bytes_used': int,
+                        'omap_bytes_used': int,
                         'percent_used': float,
                         'max_avail': int,
                         'quota_objects': int,
@@ -146,7 +154,8 @@ class HealthTest(DashboardTestCase):
                     'total_used_raw_bytes': int,
                     'total_used_raw_ratio': float,
                     'num_osds': int,
-                    'num_per_pool_osds': int
+                    'num_per_pool_osds': int,
+                    'num_per_pool_omap_osds': int
                 })
             }),
             'fs_map': JObj({
@@ -179,11 +188,15 @@ class HealthTest(DashboardTestCase):
                 'standbys': JList(JObj({}, allow_unknown=True)),
             }),
             'health': JObj({
-                'checks': JList(str),
+                'checks': JList(JObj({}, allow_unknown=True)),
+                'mutes': JList(JObj({}, allow_unknown=True)),
                 'status': str,
             }),
             'hosts': int,
-            'iscsi_daemons': int,
+            'iscsi_daemons': JObj({
+                'up': int,
+                'down': int
+            }),
             'mgr_map': JObj({
                 'active_addr': str,
                 'active_addrs': JObj({
@@ -194,12 +207,10 @@ class HealthTest(DashboardTestCase):
                     }))
                 }),
                 'active_change': str,  # timestamp
+                'active_mgr_features': int,
                 'active_gid': int,
                 'active_name': str,
-                'always_on_modules': JObj(
-                    {},
-                    allow_unknown=True, unknown_schema=JList(str)
-                ),
+                'always_on_modules': JObj({}, allow_unknown=True),
                 'available': bool,
                 'available_modules': JList(module_info_schema),
                 'epoch': int,
@@ -211,9 +222,10 @@ class HealthTest(DashboardTestCase):
                 'standbys': JList(JObj({
                     'available_modules': JList(module_info_schema),
                     'gid': int,
-                    'name': str
-                }))
-            }),
+                    'name': str,
+                    'mgr_features': int
+                }, allow_unknown=True))
+            }, allow_unknown=True),
             'mon_status': JObj({
                 'election_epoch': int,
                 'extra_probe_peers': JList(JAny(none=True)),
@@ -273,7 +285,8 @@ class HealthTest(DashboardTestCase):
             'client_perf': JObj({}, allow_unknown=True),
             'df': JObj({}, allow_unknown=True),
             'health': JObj({
-                'checks': JList(str),
+                'checks': JList(JObj({}, allow_unknown=True)),
+                'mutes': JList(JObj({}, allow_unknown=True)),
                 'status': str
             }),
             'pools': JList(JLeaf(dict)),