import 15.2.0 Octopus source

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

diff --git a/ceph/qa/tasks/mgr/dashboard/test_cluster_configuration.py b/ceph/qa/tasks/mgr/dashboard/test_cluster_configuration.py
index 798afe9c19c17779009903b2749b3a1feed8ef04..61d18000a45a4078a389d9213d4c59ccdb7f5c96 100644 (file)
--- a/ceph/qa/tasks/mgr/dashboard/test_cluster_configuration.py
+++ b/ceph/qa/tasks/mgr/dashboard/test_cluster_configuration.py
@@ -314,9 +314,6 @@ class ClusterConfigurationTest(DashboardTestCase):
             'osd_deep_scrub_randomize_ratio',  # osd-pg-scrub
             'osd_deep_scrub_stride',  # osd-pg-scrub
             'osd_deep_scrub_update_digest_min_age',  # osd-pg-scrub
-            'osd_op_queue_mclock_scrub_lim',  # osd-pg-scrub
-            'osd_op_queue_mclock_scrub_res',  # osd-pg-scrub
-            'osd_op_queue_mclock_scrub_wgt',  # osd-pg-scrub
             'osd_requested_scrub_priority',  # osd-pg-scrub
             'osd_scrub_backoff_ratio',  # osd-pg-scrub
             'osd_scrub_chunk_max',  # osd-pg-scrub
@@ -346,7 +343,7 @@ class ClusterConfigurationTest(DashboardTestCase):
         self.assertIn('services', data)
         self.assertIn('type', data)
         self.assertIn('desc', data)
-        self.assertIn(data['type'], ['str', 'bool', 'float', 'int', 'size', 'uint', 'addr', 'uuid',
+        self.assertIn(data['type'], ['str', 'bool', 'float', 'int', 'size', 'uint', 'addr', 'addrvec', 'uuid',
                                      'secs'])
 
         if 'value' in data: