mgr/dashboard_v2: removed unused code that broke teuthology

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/qa/tasks/mgr/dashboard_v2/test_cluster_configuration.py b/qa/tasks/mgr/dashboard_v2/test_cluster_configuration.py
index a88915298cba90b280fbf43d89eafc1a9e6638ea..6cfe605e9474d6d9a623d4ca64985e4b1a4adf1c 100644 (file)
--- a/qa/tasks/mgr/dashboard_v2/test_cluster_configuration.py
+++ b/qa/tasks/mgr/dashboard_v2/test_cluster_configuration.py
@@ -10,37 +10,20 @@ class ClusterConfigurationTest(DashboardTestCase):
         self.assertStatus(200)
         self.assertIsInstance(data, list)
         self.assertGreater(len(data), 1000)
-
-        # service filter
-        data = self._get('/api/cluster_conf?service=mds')
-        self.assertTrue(all('mds' in e['services'] for e in data))
-        self.assertFalse(all('mon' in e['services'] for e in data))
-
-        # basic filter
-        data = self._get('/api/cluster_conf?level=basic')
-        self.assertTrue(all('basic' in e['level'] for e in data))
-
-        # advanced filter
-        data = self._get('/api/cluster_conf?level=advanced')
-        actual_levels = set([e['level'] for e in data])
-        self.assertTrue({'advanced', 'basic'}.issubset(actual_levels))
-
-        # developer filter
-        data = self._get('/api/cluster_conf?level=developer')
-        actual_levels = set([e['level'] for e in data])
-        self.assertTrue({'advanced', 'basic',
-                         'developer'}.issubset(actual_levels))
-
-        # two filters
-        data = self._get('/api/cluster_conf?level=advanced&service=mds')
-        actual_levels = set([e['level'] for e in data])
-        self.assertTrue({'advanced', 'basic'}.issubset(actual_levels))
-        self.assertTrue(all('mds' in e['services'] for e in data))
+        for conf in data:
+            self._validate_single(conf)
 
     @authenticate
     def test_get(self):
         data = self._get('/api/cluster_conf/admin_socket')
         self.assertStatus(200)
+        self._validate_single(data)
+        self.assertIn('enum_values', data)
+
+        data = self._get('/api/cluster_conf/fantasy_name')
+        self.assertStatus(404)
+
+    def _validate_single(self, data):
         self.assertIn('name', data)
         self.assertIn('daemon_default', data)
         self.assertIn('long_desc', data)
@@ -51,9 +34,6 @@ class ClusterConfigurationTest(DashboardTestCase):
         self.assertIn('min', data)
         self.assertIn('max', data)
         self.assertIn('services', data)
-        self.assertIn('enum_values', data)
         self.assertIn('type', data)
         self.assertIn('desc', data)
 
-        data = self._get('/api/cluster_conf/fantasy_name')
-        self.assertStatus(404)

diff --git a/src/pybind/mgr/dashboard_v2/controllers/cluster_configuration.py b/src/pybind/mgr/dashboard_v2/controllers/cluster_configuration.py
index 80d5909d73246ab7df638988a4caf894d8a3e0e5..d02027b1c656819dd0cda6ade46b03c7f07ccc5d 100644 (file)
--- a/src/pybind/mgr/dashboard_v2/controllers/cluster_configuration.py
+++ b/src/pybind/mgr/dashboard_v2/controllers/cluster_configuration.py
@@ -10,22 +10,8 @@ from ..tools import ApiController, RESTController, AuthRequired
 @ApiController('cluster_conf')
 @AuthRequired()
 class ClusterConfiguration(RESTController):
-    def list(self, service=None, level=None):
-        levels = ['basic', 'advanced', 'developer']
-        if level is not None:
-            assert level in levels
-
+    def list(self):
         options = mgr.get("config_options")['options']
-
-        if service is not None:
-            options = [o for o in options if service in o['services']]
-
-        if level is not None:
-            options = [
-                o for o in options
-                if levels.index(o['level']) <= levels.index(level)
-            ]
-
         return options
 
     def get(self, name):