From 18a4a76d4433b54a1ef4e576ae4f14190471bb86 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 7 Aug 2019 15:23:19 +0800 Subject: [PATCH] qa/tasks/mgr/dashboard/test_mgr_module: sync w/ telemetry * use primitive types instead of `JLeaf(the_type)` as they are equivalent in this context * remove fields which are added only if certain channels are activated. * allow unknown fields, as we are including various stuff in the report, for instance, osdmap, usage, crash info, etc. Signed-off-by: Kefu Chai (cherry picked from commit 3303116f5681f317dee53988e1de9d840d250884) --- qa/tasks/mgr/dashboard/test_mgr_module.py | 28 ++++++++++------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/qa/tasks/mgr/dashboard/test_mgr_module.py b/qa/tasks/mgr/dashboard/test_mgr_module.py index b05e22ae5832a..0f8a878dc2817 100644 --- a/qa/tasks/mgr/dashboard/test_mgr_module.py +++ b/qa/tasks/mgr/dashboard/test_mgr_module.py @@ -111,22 +111,18 @@ class MgrModuleTelemetryTest(MgrModuleTestCase): data, JObj( sub_elems={ - 'channel_basic': JLeaf(bool), - 'channel_ident': JLeaf(bool), - 'channel_crash': JLeaf(bool), - 'channel_device': JLeaf(bool), - 'contact': JLeaf(str), - 'description': JLeaf(str), - 'enabled': JLeaf(bool), - 'interval': JLeaf(int), - 'leaderboard': JLeaf(bool), - 'organization': JLeaf(str), - 'proxy': JLeaf(str), - 'url': JLeaf(str), - 'config': JObj(sub_elems={ - 'cluster_changed': JList(str), - 'active_changed': JList(str), - }), + 'channel_basic': bool, + 'channel_ident': bool, + 'channel_crash': bool, + 'channel_device': bool, + 'contact': str, + 'description': str, + 'enabled': bool, + 'interval': int, + 'leaderboard': bool, + 'organization': str, + 'proxy': str, + 'url': str })) def test_put(self): -- 2.39.5