From: Kefu Chai <kchai@redhat.com>
Date: Wed, 7 Aug 2019 07:23:19 +0000 (+0800)
Subject: qa/tasks/mgr/dashboard/test_mgr_module: sync w/ telemetry
X-Git-Tag: v15.1.0~1950^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3303116f5681f317dee53988e1de9d840d250884;p=ceph-ci.git

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 <kchai@redhat.com>
---

diff --git a/qa/tasks/mgr/dashboard/test_mgr_module.py b/qa/tasks/mgr/dashboard/test_mgr_module.py
index b05e22ae583..0f8a878dc28 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):