RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29634 from rhcs-dashboard/mgr-module-fixes

Browse Source 
mgr/dashboard: fix mgr module API tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
This commit is contained in:
Lenz Grimmer 2019-08-14 08:18:18 +00:00 committed by GitHub
commit 70b7b61b66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
qa/tasks/mgr/dashboard/test_mgr_module.py
View File

@ -12,11 +12,6 @@ logger = logging.getLogger(__name__)
class MgrModuleTestCase(DashboardTestCase):
MGRS_REQUIRED = 1
@classmethod
def tearDownClass(cls):
cls._ceph_cmd(['mgr', 'module', 'disable', 'telemetry'])
super(MgrModuleTestCase, cls).tearDownClass()
def wait_until_rest_api_accessible(self):
"""
Wait until the REST API is accessible.
@ -37,7 +32,7 @@ class MgrModuleTestCase(DashboardTestCase):
class MgrModuleTest(MgrModuleTestCase):
def test_list_disabled_module(self):
self._ceph_cmd(['mgr', 'module', 'disable', 'telemetry'])
self._ceph_cmd(['mgr', 'module', 'disable', 'iostat'])
self.wait_until_rest_api_accessible()
data = self._get('/api/mgr/module')
self.assertStatus(200)
@ -65,12 +60,12 @@ class MgrModuleTest(MgrModuleTestCase):
'tags': JList(str)
}))
})))
module_info = self.find_object_in_list('name', 'telemetry', data)
module_info = self.find_object_in_list('name', 'iostat', data)
self.assertIsNotNone(module_info)
self.assertFalse(module_info['enabled'])
def test_list_enabled_module(self):
self._ceph_cmd(['mgr', 'module', 'enable', 'telemetry'])
self._ceph_cmd(['mgr', 'module', 'enable', 'iostat'])
self.wait_until_rest_api_accessible()
data = self._get('/api/mgr/module')
self.assertStatus(200)
@ -98,7 +93,7 @@ class MgrModuleTest(MgrModuleTestCase):
'tags': JList(str)
}))
})))
module_info = self.find_object_in_list('name', 'telemetry', data)
module_info = self.find_object_in_list('name', 'iostat', data)
self.assertIsNotNone(module_info)
self.assertTrue(module_info['enabled'])
@ -110,6 +105,7 @@ class MgrModuleTelemetryTest(MgrModuleTestCase):
self.assertSchema(
data,
JObj(
allow_unknown=True,
sub_elems={
'channel_basic': bool,
'channel_ident': bool,
@ -119,6 +115,7 @@ class MgrModuleTelemetryTest(MgrModuleTestCase):
'description': str,
'enabled': bool,
'interval': int,
'last_opt_revision': int,
'leaderboard': bool,
'organization': str,
'proxy': str,
@ -159,37 +156,3 @@ class MgrModuleTelemetryTest(MgrModuleTestCase):
self.assertEqual(data['organization'], 'SUSE Linux')
self.assertEqual(data['proxy'], 'foo')
self.assertEqual(data['url'], 'https://foo.bar/report')
def test_enable(self):
self._ceph_cmd(['mgr', 'module', 'disable', 'telemetry'])
self.wait_until_rest_api_accessible()
try:
# Note, an exception is thrown because the Ceph Mgr
# modules are reloaded.
self._post('/api/mgr/module/telemetry/enable')
except requests.ConnectionError:
pass
self.wait_until_rest_api_accessible()
data = self._get('/api/mgr/module')
self.assertStatus(200)
module_info = self.find_object_in_list('name', 'telemetry', data)
self.assertIsNotNone(module_info)
self.assertTrue(module_info['enabled'])
def test_disable(self):
# Enable the 'telemetry' module (all CephMgr modules are restarted)
# and wait until the Dashboard REST API is accessible.
self._ceph_cmd(['mgr', 'module', 'enable', 'telemetry'])
self.wait_until_rest_api_accessible()
try:
# Note, an exception is thrown because the Ceph Mgr
# modules are reloaded.
self._post('/api/mgr/module/telemetry/disable')
except requests.ConnectionError:
pass
self.wait_until_rest_api_accessible()
data = self._get('/api/mgr/module')
self.assertStatus(200)
module_info = self.find_object_in_list('name', 'telemetry', data)
self.assertIsNotNone(module_info)
self.assertFalse(module_info['enabled'])