dummy

diff --git a/src/pybind/mgr/dashboard/services/nvmeof_cli.py b/src/pybind/mgr/dashboard/services/nvmeof_cli.py
index 7a8d4180714a956165db15030c218a3540d4e950..42ef277d695ccf74419f957510dc44c387ebd8eb 100644 (file)
--- a/src/pybind/mgr/dashboard/services/nvmeof_cli.py
+++ b/src/pybind/mgr/dashboard/services/nvmeof_cli.py
@@ -2,6 +2,7 @@
 from abc import ABC, abstractmethod
 from enum import Enum
 import errno
+import inspect
 import json
 import logging
 from typing import Annotated, Any, Callable, Dict, List, NamedTuple, Optional, Type, \
@@ -268,6 +269,7 @@ class NvmeofCLICommand(CLICommand):
 
         self._success_message_template = success_message_template
         self._success_message_fn = success_message_fn
+        self._func_defaults: Dict[str, Any] = {}
 
     def _use_api_endpoint_desc_if_available(self, func):
         if not self.desc and hasattr(func, 'doc_info'):
@@ -275,7 +277,7 @@ class NvmeofCLICommand(CLICommand):
 
     def __call__(self, func) -> HandlerFuncType:  # type: ignore
         resp = super().__call__(func)
-
+        self._func_defaults = self._compute_func_defaults()
         if self._alias:
             self._alias_cmd = NvmeofCLICommand(
                 self._alias,
@@ -285,22 +287,35 @@ class NvmeofCLICommand(CLICommand):
             )
             assert self._alias_cmd is not None
             self._alias_cmd(func)
+            self._alias_cmd._func_defaults = self._alias_cmd._compute_func_defaults()
 
         self._use_api_endpoint_desc_if_available(func)
         return resp
 
+
+    def _compute_func_defaults(self) -> Dict[str, Any]:
+        defaults: Dict[str, Any] = {}
+        sig = inspect.signature(self.func)
+
+        for name, param in sig.parameters.items():
+            if name in CLICommand.KNOWN_ARGS:
+                continue
+            if name not in self.arg_spec:
+                continue
+            if param.default is not inspect.Parameter.empty:
+                defaults[name] = param.default
+
+        return defaults
+
     def _args_map_from_argspec(self,
                                cmd_dict: Dict[str, Any],
                                inbuf: Optional[str] = None) -> Dict[str, Any]:
-        """
-        Build a dict of param_name -> value using the same mechanism as CLICommand.call.
-        This applies defaults and type casting via CephArgtype.cast_to.
-        """
         kwargs, specials = self._collect_args_by_argspec(cmd_dict)
         if inbuf and 'inbuf' in specials:
             kwargs['inbuf'] = inbuf
 
-        return kwargs
+        
+        return {**self._func_defaults, **kwargs}
 
 
     def _stringify(self, value: Any) -> str:

diff --git a/src/pybind/mgr/dashboard/tests/test_nvmeof_cli.py b/src/pybind/mgr/dashboard/tests/test_nvmeof_cli.py
index 2ba17c1e0194c73e15375a9e84bb78cf39ac2862..168f0127c72c8ae68f85601b735ebd45a797aef6 100644 (file)
--- a/src/pybind/mgr/dashboard/tests/test_nvmeof_cli.py
+++ b/src/pybind/mgr/dashboard/tests/test_nvmeof_cli.py
@@ -386,7 +386,91 @@ class TestNvmeofCLICommandSuccessMessage:
         )
         assert res.retval == 0
         assert res.stdout == "ns 42 hosts a,b"
+    
+    def test_success_message_uses_default_when_cli_omits_param(self):
+        class Model(NamedTuple):
+            status: str
+        def create(mgr,nqn: str,host_name: str, traddr: str, trsvcid: int = 4420, adrfam: int = 0, gw_group: Optional[str] = None):
+            return Model(status="ok")
+        cmd = NvmeofCLICommand("nvmeof listener add", model=Model, success_message_template="Adding {nqn} listener at {traddr}:{trsvcid}: Successful")
+
+        # Simulate a CLI invocation without trsvcid (and without format flag).
+        # CLICommand.call will use _collect_args_by_argspec; for this test
+        # we pass the minimal dict that would be parsed from CLI switches.
+        cmd_dict = {
+            "nqn": "nqn.2014-08.org.nvmexpress:uuid:1234",
+            "host_name": "nvme-host-1",
+            "traddr": "10.0.0.5",
+            # 'trsvcid' intentionally omitted
+            # 'adrfam' intentionally omitted
+        }
+
+        # Run command
+        result = cmd.call(mgr=None, cmd_dict=cmd_dict, inbuf=None)
 
+        assert result.rval == 0
+        assert result.err == ""
+        assert result.out == (
+            "Adding nqn.2014-08.org.nvmexpress:uuid:1234 listener at 10.0.0.5:4420: Successful"
+        )
+
+
+    def test_success_message_cli_value_overrides_default(self):
+        class Model(NamedTuple):
+            status: str
+        cmd = Model()
+
+        cmd_dict = {
+            "nqn": "nqn.2014-08.org.nvmexpress:uuid:abcd",
+            "host_name": "nvme-host-2",
+            "traddr": "192.168.1.10",
+            "trsvcid": 8009,  # override default 4420
+        }
+
+        result = cmd.call(mgr=None, cmd_dict=cmd_dict, inbuf=None)
+
+        assert result.rval == 0
+        assert result.err == ""
+        assert result.out == (
+            "Adding nqn.2014-08.org.nvmexpress:uuid:abcd listener at 192.168.1.10:8009: Successful"
+        )
+
+
+    def test_defaults_allow_none_and_template_does_not_crash(self):
+        class Model(NamedTuple):
+            status: str
+            
+        # Define a handler with a None default referenced in the template
+        def create_with_none(
+            mgr,
+            nqn: str,
+            traddr: str,
+            trsvcid: int = 4420,
+            gw_group: Optional[str] = None,  # None default intentionally used
+        ):
+            return Model(status="ok")
+
+        cmd = NvmeofCLICommand(
+            "nvmeof listener add",
+            model=Model,
+            success_message_template="Adding {nqn} listener at {traddr}:{trsvcid} gw={gw_group}: Successful",
+        )
+        cmd(create_with_none)
+
+        cmd_dict = {
+            "nqn": "nqn.none.test",
+            "traddr": "127.0.0.1",
+            # 'gw_group' omitted; None default should be injected
+        }
+
+        result = cmd.call(mgr=None, cmd_dict=cmd_dict, inbuf=None)
+
+        assert result.rval == 0
+        assert result.err == ""
+        # gw_group should stringify to 'None' under current _stringify implementation
+        assert result.out == (
+            "Adding nqn.none.test listener at 127.0.0.1:4420 gw=None: Successful"
+        )
 
 
 class TestNVMeoFConfCLI(unittest.TestCase, CLICommandTestMixin):