From: Patrick Donnelly <pdonnell@ibm.com>
Date: Mon, 2 Feb 2026 18:02:54 +0000 (-0500)
Subject: Merge PR #66467 into wip-pdonnell-testing-20260202.180245
X-Git-Tag: testing/wip-pdonnell-testing-20260202.180245~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82d5c0810fff14edcd94d908e5c038d354d3f84f;p=ceph-ci.git

Merge PR #66467 into wip-pdonnell-testing-20260202.180245

* refs/pull/66467/head:
	pybind/mgr: add per-module CLICommand instances to remaining modules
	pybind/mgr/dashboard: create DBCLICommand, use throughout
	pybind/mgr/tests/test_object_format: update DecoDemo to use fresh CLICommand
	pybind/mgr/smb: adapt SMBCommand to use CLICommandBase
	pybind/orchestrator,cephadm: replace CLICommandMeta
	pybind/mgr: mechanically fix simple users to not import CLI*Command
	pybind/mgr/mgr_module: support per-module CLICommand instances and globals
	pybind/.../dashboard: misc automatic linter fixes
---

82d5c0810fff14edcd94d908e5c038d354d3f84f
diff --cc src/pybind/mgr/dashboard/plugins/feature_toggles.py
index 6ff3931bd14,869ef04ac19..0ee72fa794f
--- a/src/pybind/mgr/dashboard/plugins/feature_toggles.py
+++ b/src/pybind/mgr/dashboard/plugins/feature_toggles.py
@@@ -1,12 -1,13 +1,13 @@@
  # -*- coding: utf-8 -*-
  
  from enum import Enum
 -from typing import Dict, List, Optional, Set, no_type_check
 +from typing import Dict, List, Optional, Set
  
  import cherrypy
- from mgr_module import CLICommand, Option
+ from mgr_module import Option
  from mgr_util import CLIWarning
  
+ from ..cli import DBCLICommand
  from ..controllers.cephfs import CephFS
  from ..controllers.iscsi import Iscsi, IscsiTarget
  from ..controllers.nfs import NFSGaneshaExports, NFSGaneshaUi