pybind/mgr/tests/test_object_format: update DecoDemo to use fresh CLICommand

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/pybind/mgr/tests/test_object_format.py b/src/pybind/mgr/tests/test_object_format.py
index 2e674c69838cae2489b8eb7e5d0def744404ff2f..4d7e92fc94b7fe7975818f3572cc981a379b6678 100644 (file)
--- a/src/pybind/mgr/tests/test_object_format.py
+++ b/src/pybind/mgr/tests/test_object_format.py
@@ -10,13 +10,17 @@ from typing import (
 
 import pytest
 
-from mgr_module import CLICommand
+from mgr_module import CLICommandBase
 import object_format
 
 
 T = TypeVar("T", bound="Parent")
 
 
+DecoDemoCLICommand = CLICommandBase.make_registry_subtype(
+    "DecoDemoCLICommand")
+
+
 class Simpler:
     def __init__(self, name, val=None):
         self.name = name
@@ -259,10 +263,10 @@ class FancyDemoAdapter(PhonyMultiYAMLFormatAdapter):
         return f"{size} box{es} of {name}"
 
 
-class DecoDemo:
+class DecoDemo(object):
     """Class to stand in for a mgr module, used to test CLICommand integration."""
 
-    @CLICommand("alpha one", perm="rw")
+    @DecoDemoCLICommand("alpha one", perm="rw")
     @object_format.Responder()
     def alpha_one(self, name: str = "default") -> Dict[str, str]:
         return {
@@ -271,7 +275,7 @@ class DecoDemo:
             "weight": 300,
         }
 
-    @CLICommand("beta two", perm="r")
+    @DecoDemoCLICommand("beta two", perm="r")
     @object_format.Responder()
     def beta_two(
         self, name: str = "default", format: Optional[str] = None
@@ -282,19 +286,19 @@ class DecoDemo:
             "weight": 72,
         }
 
-    @CLICommand("gamma three", perm="rw")
+    @DecoDemoCLICommand("gamma three", perm="rw")
     @object_format.Responder(FancyDemoAdapter)
     def gamma_three(self, size: int = 0) -> Dict[str, Any]:
         return {"name": "funnystuff", "size": size}
 
-    @CLICommand("z_err", perm="rw")
+    @DecoDemoCLICommand("z_err", perm="rw")
     @object_format.ErrorResponseHandler()
     def z_err(self, name: str = "default") -> Tuple[int, str, str]:
         if "z" in name:
             raise object_format.ErrorResponse(f"{name} bad")
         return 0, name, ""
 
-    @CLICommand("empty one", perm="rw")
+    @DecoDemoCLICommand("empty one", perm="rw")
     @object_format.EmptyResponder()
     def empty_one(self, name: str = "default", retval: Optional[int] = None) -> None:
         # in real code, this would be making some sort of state change
@@ -305,7 +309,7 @@ class DecoDemo:
             raise object_format.ErrorResponse(name, return_value=retval)
         return
 
-    @CLICommand("empty bad", perm="rw")
+    @DecoDemoCLICommand("empty bad", perm="rw")
     @object_format.EmptyResponder()
     def empty_bad(self, name: str = "default") -> int:
         # in real code, this would be making some sort of state change
@@ -503,9 +507,10 @@ class DecoDemo:
         ),
     ],
 )
+
 def test_cli_with_decorators(prefix, can_format, args, response):
     dd = DecoDemo()
-    cmd = CLICommand.COMMANDS[prefix]
+    cmd = DecoDemoCLICommand.COMMANDS[prefix]
     assert cmd.call(dd, args, None) == response
     # slighly hacky way to check that the CLI "knows" about a --format option
     # checking the extra_args feature of the Decorators that provide them (Responder)
@@ -603,4 +608,4 @@ def test_error_response():
 def test_empty_responder_return_check():
     dd = DecoDemo()
     with pytest.raises(ValueError):
-        CLICommand.COMMANDS["empty bad"].call(dd, {}, None)
+        DecoDemoCLICommand.COMMANDS["empty bad"].call(dd, {}, None)