DNM: add dummy progress command to request spec from rbd_support

diff --git a/src/pybind/mgr/progress/module.py b/src/pybind/mgr/progress/module.py
index 6339cc860cbb32ef00a78cf6c8ef8dd742fa1b28..8b88c433ed793bd3a50380cf7dc24973a8d86774 100644 (file)
--- a/src/pybind/mgr/progress/module.py
+++ b/src/pybind/mgr/progress/module.py
@@ -430,8 +430,10 @@ class Module(MgrModule):
          "perm": "rw"},
         {"cmd": "progress off",
          "desc": "Disable progress tracking",
-         "perm": "rw"}
-
+         "perm": "rw"},
+        {"cmd": "progress test intermodule call",
+         "desc": "request spec from rbd_suport module DNM",
+         "perm": "r"}
     ]
 
     MODULE_OPTIONS = [
@@ -873,5 +875,13 @@ class Module(MgrModule):
             self.off()
             self.clear()
             return 0, "", "progress disabled"
+        elif cmd['prefix'] == "progress test intermodule call":
+            ret = self.remote('rbd_support', 'test_intermodule_call')
+            try:
+                ret.validate()
+            except Exception as e:
+                self.getLogger().error("validate failed {}".format(e))
+                raise e
+            return 0, "", "worked"
         else:
             raise NotImplementedError(cmd['prefix'])

diff --git a/src/pybind/mgr/rbd_support/module.py b/src/pybind/mgr/rbd_support/module.py
index 369face038ad2a4d0899821adf1118432d88bd01..d002acec115f2e8bb5c11621ffab466d912f9514 100644 (file)
--- a/src/pybind/mgr/rbd_support/module.py
+++ b/src/pybind/mgr/rbd_support/module.py
@@ -192,6 +192,23 @@ class Module(MgrModule):
             sort_by_name = sort_by.name if sort_by else OSD_PERF_QUERY_COUNTERS[0]
             return self.perf.get_perf_stats(pool_spec, sort_by_name)
 
+    @CLIReadCommand('rbd test_intermodule_call')
+    @with_latest_osdmap
+    def test_intermodule_call(self):
+        with self.perf.lock:
+            pool = 3
+            group = 4
+            placement = "asdf"
+            from ceph.deployment.service_spec import NvmeofServiceSpec, ServiceSpec, PlacementSpec
+            ret = NvmeofServiceSpec(
+                service_id=f'{pool}.{group}' if group else pool,
+                pool=pool,
+                group=group,
+                placement=PlacementSpec.from_string(placement),
+            )
+            #ret.validate()
+            return ret
+
     @CLIReadCommand('rbd perf image counters')
     @with_latest_osdmap
     def perf_image_counters(self,