Merge pull request #26346 from noahdesu/mgr-orch-cache-refresh

mgr/orch: refresh option for inventory query

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc qa/tasks/mgr/test_orchestrator_cli.py
Simple merge

diff --cc src/pybind/mgr/orchestrator.py
Simple merge

diff --cc src/pybind/mgr/orchestrator_cli/module.py
index b54b68dca2a8a1d74819fbdf07683fb44db1b564,f6043cd9b641f9dce58c45aa03b495992935dfff..77b7db461eeea0fdf9ce530ba58cf497716342ca
--- 1/src/pybind/mgr/orchestrator_cli/module.py
--- 2/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@@ -42,40 -42,14 +42,41 @@@ class OrchestratorCli(orchestrator.Orch
  
          return o
  
 +    @CLIWriteCommand('orchestrator host add',
 +                     "name=host,type=CephString,req=true",
 +                     'Add a host')
 +    @handle_exceptions
 +    def _add_host(self, host):
 +        completion = self.add_host(host)
 +        self._orchestrator_wait([completion])
 +        return HandleCommandResult(stdout=str(completion.result))
 +
 +    @CLIWriteCommand('orchestrator host rm',
 +                     "name=host,type=CephString,req=true",
 +                     'Remove a host')
 +    @handle_exceptions
 +    def _remove_host(self, host):
 +        completion = self.remove_host(host)
 +        self._orchestrator_wait([completion])
 +        return HandleCommandResult(stdout=str(completion.result))
 +
 +    @CLIReadCommand('orchestrator host ls',
 +                    desc='List hosts')
 +    @handle_exceptions
 +    def _get_hosts(self):
 +        completion = self.get_hosts()
 +        self._orchestrator_wait([completion])
 +        result = "\n".join(map(lambda node: node.name, completion.result))
 +        return HandleCommandResult(stdout=result)
 +
      @CLIReadCommand('orchestrator device ls',
                      "name=host,type=CephString,n=N,req=false "
-                     "name=format,type=CephChoices,strings=json|plain,req=false",
+                     "name=format,type=CephChoices,strings=json|plain,req=false "
+                     "name=refresh,type=CephBool,req=false",
                      'List devices on a node')
      @handle_exceptions
-     def _list_devices(self, host=None, format='plain'):
-         # type: (List[str], str) -> HandleCommandResult
+     def _list_devices(self, host=None, format='plain', refresh=False):
+         # type: (List[str], str, bool) -> HandleCommandResult
          """
          Provide information about storage devices present in cluster hosts
  

diff --cc src/pybind/mgr/test_orchestrator/module.py
Simple merge