acex-cli 4.5.1__tar.gz → 4.6.0__tar.gz

{acex_cli-4.5.1 → acex_cli-4.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acex-cli
-Version: 4.5.1
+Version: 4.6.0
 Summary: ACE-X CLI - Command-line interface for ACE-X
 License: AGPL-3.0
 Keywords: automation,cli,control
@@ -11,13 +11,14 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: acex-client (>=4.8.1,<5.0.0)
-Requires-Dist: acex-devkit (>=2.4.0,<3.0.0)
-Requires-Dist: acex-driver-cisco-ioscli (>=2.7.0,<3.0.0)
-Requires-Dist: click (==8.1.7)
-Requires-Dist: ntc-templates (>=8.1.0,<9.0.0)
-Requires-Dist: rich (>=13.0.0,<14.0.0)
-Requires-Dist: typer (>=0.12.0,<0.13.0)
+Classifier: Programming Language :: Python :: 3.15
+Requires-Dist: acex-client (>=4.11.0,<5.0.0)
+Requires-Dist: acex-devkit (>=2.11.0,<3.0.0)
+Requires-Dist: acex-driver-cisco-ioscli (>=2.7.4,<3.0.0)
+Requires-Dist: click (>=8.1.7)
+Requires-Dist: ntc-templates (>=8.1.0)
+Requires-Dist: rich (>=13.0.0)
+Requires-Dist: typer (>=0.12.0)
 Project-URL: Homepage, https://github.com/acex-labs/acex
 Project-URL: Repository, https://github.com/acex-labs/acex
 Description-Content-Type: text/markdown

{acex_cli-4.5.1 → acex_cli-4.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "acex-cli"
-version = "4.5.1"
+version = "4.6.0"
 description = "ACE-X CLI - Command-line interface for ACE-X"
 authors = ["Johan Lahti <johan.lahti@acebit.se>"]
 readme = "README.md"
@@ -14,13 +14,13 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.13"
-typer = "^0.12.0"
-rich = "^13.0.0"
-click = "8.1.7"
-acex-client = "^4.8.1" # Changes to real dep. by switch_acex_client_dep for publishing
-acex-devkit = "^2.4.0"
-acex-driver-cisco-ioscli = "^2.7.0"
-ntc-templates = "^8.1.0"
+typer = ">=0.12.0"
+rich = ">=13.0.0"
+click = ">=8.1.7"
+acex-client = "^4.11.0" # Changes to real dep. by switch_acex_client_dep for publishing
+acex-devkit = "^2.11.0"
+acex-driver-cisco-ioscli = "^2.7.4"
+ntc-templates = ">=8.1.0"
 
 [tool.poetry.scripts]
 acex = "acex_cli.main:app"

acex_cli-4.6.0/src/acex_cli/__init__.py

@@ -0,0 +1,5 @@
+"""ACE-X CLI - Command-line interface for ACE-X."""
+
+import importlib.metadata
+
+__version__ = importlib.metadata.version("acex-cli")

{acex_cli-4.5.1 → acex_cli-4.6.0}/src/acex_cli/commands/node.py

@@ -57,7 +57,7 @@ def _fetch_node_instance(sdk, identifier: str):
             typer.echo(f"Multiple nodes match '{identifier}':")
             from acex_cli.output import display_list
 
-            display_list(result, columns=["id", "hostname", "site", "status"], title="")
+            display_list(result, columns=["id", "hostname", "site", "admin_status", "provision_status"], title="")
             raise typer.Exit(1)
         node = sdk.node_instances.get(result.items[0].id)
     if not node:
@@ -84,7 +84,7 @@ def _resolve_node_quick(sdk, identifier: str):
         typer.echo(f"Multiple nodes match '{identifier}':")
         from acex_cli.output import display_list
 
-        display_list(result, columns=["id", "hostname", "site", "status"], title="")
+        display_list(result, columns=["id", "hostname", "site", "admin_status", "provision_status"], title="")
         raise typer.Exit(1)
     return result.items[0]
 
@@ -205,7 +205,11 @@ def list_cmd(
     hostname: str | None = typer.Option(None, help="Filter by hostname (prefix match)"),
     logical_node_id: int | None = typer.Option(None, help="Filter by logical node ID"),
     asset_ref_id: int | None = typer.Option(None, help="Filter by asset ref ID"),
-    status: str | None = typer.Option(None, help="Filter by status (planned, init, active, decommissioned)"),
+    admin_status: str | None = typer.Option(None, help="Filter by admin status (planned, active, decommissioned)"),
+    provision_status: str | None = typer.Option(
+        None,
+        help=("Filter by provision status (unprovisioned, adopted, enrolled, provisioning, provisioned, failed)"),
+    ),
     # Pagination
     limit: int = typer.Option(100, "--limit", "-l", help="Max items to return"),
     offset: int = typer.Option(0, "--offset", help="Items to skip"),
@@ -221,13 +225,16 @@ def list_cmd(
         hostname=hostname,
         logical_node_id=logical_node_id,
         asset_ref_id=asset_ref_id,
-        status=status,
+        admin_status=admin_status,
+        provision_status=provision_status,
     )
     result = sdk.node_instances.query(limit=limit, offset=offset, **filters)
     display_list(
         result,
         format=format,
-        columns=columns.split(",") if columns else ["id", "hostname", "site", "status", "vendor", "os", "ned_id"],
+        columns=columns.split(",")
+        if columns
+        else ["id", "hostname", "site", "admin_status", "provision_status", "vendor", "os", "ned_id"],
         no_header=no_header,
         model=NodeListItem,
         title="Node Instances",
@@ -641,7 +648,8 @@ def _flatten_node(node, node_id: str = None) -> dict:
         "hostname": logical_node.get("hostname"),
         "site": logical_node.get("site"),
         "role": logical_node.get("role"),
-        "status": data.get("status"),
+        "admin_status": data.get("admin_status"),
+        "provision_status": data.get("provision_status"),
         "vendor": asset.get("vendor"),
         "os": asset.get("os"),
         "os_version": asset.get("os_version"),
@@ -673,7 +681,7 @@ def _resolve_node(sdk, identifier: str):
         typer.echo(f"Multiple nodes match hostname '{identifier}':")
         from acex_cli.output import display_list
 
-        display_list(result, columns=["id", "hostname", "site", "status"], title="")
+        display_list(result, columns=["id", "hostname", "site", "admin_status", "provision_status"], title="")
         typer.echo("Use the ID to specify which node.")
         raise typer.Exit(1)
 
@@ -693,7 +701,7 @@ def _resolve_node_id(sdk, identifier: str) -> str:
         typer.echo(f"Multiple nodes match hostname '{identifier}':")
         from acex_cli.output import display_list
 
-        display_list(result, columns=["id", "hostname", "site", "status"], title="")
+        display_list(result, columns=["id", "hostname", "site", "admin_status", "provision_status"], title="")
         typer.echo("Use the ID to specify which node.")
         raise typer.Exit(1)
     typer.echo(f"Node '{identifier}' not found.")

acex_cli-4.5.1/src/acex_cli/__init__.py

@@ -1,3 +0,0 @@
-"""ACE-X CLI - Command-line interface for ACE-X."""
-
-__version__ = "0.2.0"