refactor: ADR-0008 lots 4+5 — migrate object and qos

object (8 leaves):
  container-list/show/create/delete/set/save → object container <verb>
  account-set/unset                          → object account set/unset

qos (8 leaves):
  policy-list/show/create/set/delete         → qos policy <verb>
  rule-list/create/delete                    → qos rule <verb>

Sub-groups created: ``object container``, ``object account``,
``qos policy``, ``qos rule``. All sixteen old hyphenated names live
on as deprecated aliases via ``add_command_with_alias``; whitelists
for ``object`` and ``qos`` are now empty.

Author: kallioli

orca_cli/commands/object_store.py

@@ -11,6 +11,7 @@
 import click
 from rich.tree import Tree
 
+from orca_cli.core.aliases import add_command_with_alias
 from orca_cli.core.context import OrcaContext
 from orca_cli.core.exceptions import OrcaCLIError
 from orca_cli.core.output import console, output_options, print_detail, print_list
@@ -80,7 +81,12 @@ def object_stats(ctx: click.Context, output_format: str, columns: tuple[str, ...
 # ── container-list ───────────────────────────────────────────────────────────
 
 
-@object_store.command("container-list")
+@object_store.group("container")
+def object_container() -> None:
+    """Manage Swift containers."""
+
+
+@object_container.command("list")
 @output_options
 @click.pass_context
 def container_list(ctx: click.Context, output_format: str, columns: tuple[str, ...], fit_width: bool, max_width: int | None, noindent: bool) -> None:
@@ -109,7 +115,7 @@ def container_list(ctx: click.Context, output_format: str, columns: tuple[str, .
 # ── container-show ───────────────────────────────────────────────────────────
 
 
-@object_store.command("container-show")
+@object_container.command("show")
 @click.argument("container")
 @output_options
 @click.pass_context
@@ -141,7 +147,7 @@ def container_show(ctx: click.Context, container: str, output_format: str, colum
 # ── container-create ─────────────────────────────────────────────────────────
 
 
-@object_store.command("container-create")
+@object_container.command("create")
 @click.argument("container")
 @click.pass_context
 def container_create(ctx: click.Context, container: str) -> None:
@@ -155,7 +161,7 @@ def container_create(ctx: click.Context, container: str) -> None:
 # ── container-delete ─────────────────────────────────────────────────────────
 
 
-@object_store.command("container-delete")
+@object_container.command("delete")
 @click.argument("container")
 @click.option("--recursive", is_flag=True, default=False, help="Delete all objects before deleting the container.")
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompt.")
@@ -186,7 +192,7 @@ def container_delete(ctx: click.Context, container: str, recursive: bool, yes: b
 # ── container-set ────────────────────────────────────────────────────────────
 
 
-@object_store.command("container-set")
+@object_container.command("set")
 @click.argument("container")
 @click.option("--property", "properties", multiple=True, required=True, help="Metadata key=value pair (repeatable).")
 @click.pass_context
@@ -209,7 +215,7 @@ def container_set(ctx: click.Context, container: str, properties: tuple[str, ...
 # ── container-save ───────────────────────────────────────────────────────────
 
 
-@object_store.command("container-save")
+@object_container.command("save")
 @click.argument("container")
 @click.option("--output-dir", default=".", show_default=True, help="Local directory to save objects into.")
 @click.pass_context
@@ -593,7 +599,12 @@ def object_unset(ctx: click.Context, container: str, object_name: str, propertie
 # ── account-set ───────────────────────────────────────────────────────────────
 
 
-@object_store.command("account-set")
+@object_store.group("account")
+def object_account() -> None:
+    """Manage Swift account-level metadata."""
+
+
+@object_account.command("set")
 @click.option("--property", "properties", multiple=True, required=True, help="Metadata key=value pair (repeatable).")
 @click.pass_context
 def object_account_set(ctx: click.Context, properties: tuple[str, ...]) -> None:
@@ -615,7 +626,7 @@ def object_account_set(ctx: click.Context, properties: tuple[str, ...]) -> None:
 # ── account-unset ─────────────────────────────────────────────────────────────
 
 
-@object_store.command("account-unset")
+@object_account.command("unset")
 @click.option("--property", "properties", multiple=True, required=True, help="Metadata key to remove (repeatable).")
 @click.pass_context
 def object_account_unset(ctx: click.Context, properties: tuple[str, ...]) -> None:
@@ -694,3 +705,31 @@ def _add_nodes(parent_tree: Tree, subtree: dict) -> None:
 
         _add_nodes(tree, folder_tree)
         console.print(tree)
+
+
+# ── ADR-0008 deprecated aliases (backward compatibility) ────────────────
+
+add_command_with_alias(object_store, container_list,
+                        legacy_name="container-list",
+                        primary_path="object container list")
+add_command_with_alias(object_store, container_show,
+                        legacy_name="container-show",
+                        primary_path="object container show")
+add_command_with_alias(object_store, container_create,
+                        legacy_name="container-create",
+                        primary_path="object container create")
+add_command_with_alias(object_store, container_delete,
+                        legacy_name="container-delete",
+                        primary_path="object container delete")
+add_command_with_alias(object_store, container_set,
+                        legacy_name="container-set",
+                        primary_path="object container set")
+add_command_with_alias(object_store, container_save,
+                        legacy_name="container-save",
+                        primary_path="object container save")
+add_command_with_alias(object_store, object_account_set,
+                        legacy_name="account-set",
+                        primary_path="object account set")
+add_command_with_alias(object_store, object_account_unset,
+                        legacy_name="account-unset",
+                        primary_path="object account unset")

orca_cli/commands/qos_policy.py

@@ -4,6 +4,7 @@
 
 import click
 
+from orca_cli.core.aliases import add_command_with_alias
 from orca_cli.core.context import OrcaContext
 from orca_cli.core.exceptions import OrcaCLIError
 from orca_cli.core.output import console, output_options, print_detail, print_list
@@ -26,7 +27,12 @@ def qos_policy() -> None:
 
 # ── Policy CRUD ────────────────────────────────────────────────────────────
 
-@qos_policy.command("policy-list")
+@qos_policy.group("policy")
+def qos_policy_group() -> None:
+    """Manage QoS policies."""
+
+
+@qos_policy_group.command("list")
 @click.option("--shared", is_flag=True, default=False, help="Show only shared policies.")
 @output_options
 @click.pass_context
@@ -50,7 +56,7 @@ def qos_policy_list(ctx, shared, output_format, columns, fit_width, max_width, n
     )
 
 
-@qos_policy.command("policy-show")
+@qos_policy_group.command("show")
 @click.argument("policy_id", callback=validate_id)
 @output_options
 @click.pass_context
@@ -66,7 +72,7 @@ def qos_policy_show(ctx, policy_id, output_format, columns, fit_width, max_width
     )
 
 
-@qos_policy.command("policy-create")
+@qos_policy_group.command("create")
 @click.option("--name", required=True, help="Policy name.")
 @click.option("--shared", is_flag=True, default=False, help="Share with all projects.")
 @click.option("--default", "is_default", is_flag=True, default=False,
@@ -83,7 +89,7 @@ def qos_policy_create(ctx, name, shared, is_default, description):
     console.print(f"[green]QoS policy '{name}' created: {p.get('id', '?')}[/green]")
 
 
-@qos_policy.command("policy-set")
+@qos_policy_group.command("set")
 @click.argument("policy_id", callback=validate_id)
 @click.option("--name", default=None, help="New name.")
 @click.option("--description", default=None, help="New description.")
@@ -110,7 +116,7 @@ def qos_policy_set(ctx, policy_id, name, description, shared, is_default):
     console.print(f"[green]QoS policy {policy_id} updated.[/green]")
 
 
-@qos_policy.command("policy-delete")
+@qos_policy_group.command("delete")
 @click.argument("policy_id", callback=validate_id)
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation.")
 @click.pass_context
@@ -125,7 +131,12 @@ def qos_policy_delete(ctx, policy_id, yes):
 
 # ── Rules ─────────────────────────────────────────────────────────────────
 
-@qos_policy.command("rule-list")
+@qos_policy.group("rule")
+def qos_rule() -> None:
+    """Manage QoS rules attached to a policy."""
+
+
+@qos_rule.command("list")
 @click.argument("policy_id", callback=validate_id)
 @click.option("--type", "rule_type",
               type=click.Choice(list(_RULE_TYPES)),
@@ -155,7 +166,7 @@ def qos_rule_list(ctx, policy_id, rule_type,
     )
 
 
-@qos_policy.command("rule-create")
+@qos_rule.command("create")
 @click.argument("policy_id", callback=validate_id)
 @click.option("--type", "rule_type",
               type=click.Choice(list(_RULE_TYPES)),
@@ -208,7 +219,7 @@ def qos_rule_create(ctx, policy_id, rule_type, max_kbps, max_burst_kbps,
     console.print(f"[green]QoS {rule_type} rule created: {r.get('id', '?')}[/green]")
 
 
-@qos_policy.command("rule-delete")
+@qos_rule.command("delete")
 @click.argument("policy_id", callback=validate_id)
 @click.argument("rule_id", callback=validate_id)
 @click.option("--type", "rule_type",
@@ -224,3 +235,23 @@ def qos_rule_delete(ctx, policy_id, rule_id, rule_type, yes):
         click.confirm(f"Delete QoS {rule_type} rule {rule_id}?", abort=True)
     svc.delete_qos_rule(policy_id, _RULE_TYPES[rule_type], rule_id)
     console.print(f"[green]QoS rule {rule_id} deleted.[/green]")
+
+
+# ── ADR-0008 deprecated aliases (backward compatibility) ────────────────
+
+add_command_with_alias(qos_policy, qos_policy_list,
+                        legacy_name="policy-list", primary_path="qos policy list")
+add_command_with_alias(qos_policy, qos_policy_show,
+                        legacy_name="policy-show", primary_path="qos policy show")
+add_command_with_alias(qos_policy, qos_policy_create,
+                        legacy_name="policy-create", primary_path="qos policy create")
+add_command_with_alias(qos_policy, qos_policy_set,
+                        legacy_name="policy-set", primary_path="qos policy set")
+add_command_with_alias(qos_policy, qos_policy_delete,
+                        legacy_name="policy-delete", primary_path="qos policy delete")
+add_command_with_alias(qos_policy, qos_rule_list,
+                        legacy_name="rule-list", primary_path="qos rule list")
+add_command_with_alias(qos_policy, qos_rule_create,
+                        legacy_name="rule-create", primary_path="qos rule create")
+add_command_with_alias(qos_policy, qos_rule_delete,
+                        legacy_name="rule-delete", primary_path="qos rule delete")

tests/test_naming_convention.py

@@ -74,11 +74,8 @@
     # nested under a sub-group (agent, port, rbac, segment, subnet,
     # auto-allocated-topology, router) or sub-sub-group (router add/remove
     # for interface/route, router set/unset for gateway).
-    "object": {
-        "account-set", "account-unset",
-        "container-create", "container-delete", "container-list",
-        "container-save", "container-set", "container-show",
-    },
+    # object — migrated 2026-04-28: account-* moved under
+    # ``object account``, container-* moved under ``object container``.
     "placement": {
         "allocation-candidate-list", "allocation-delete", "allocation-set",
         "allocation-show",
@@ -104,11 +101,8 @@
         "set-color", "set-region",
         "to-clouds", "to-openrc",
     },
-    "qos": {
-        "policy-create", "policy-delete", "policy-list",
-        "policy-set", "policy-show",
-        "rule-create", "rule-delete", "rule-list",
-    },
+    # qos — migrated 2026-04-28: policy-* under ``qos policy``,
+    # rule-* under ``qos rule``.
     "rating": {
         "metric-list", "metric-show",
         "module-disable", "module-enable", "module-list",