greenlake-activate-cli 0.2.2__tar.gz → 0.3.0__tar.gz

{greenlake_activate_cli-0.2.2 → greenlake_activate_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenlake-activate-cli
-Version: 0.2.2
+Version: 0.3.0
 Summary: A CLI tool used to interact with HPE GreenLake Activate
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -11,23 +11,25 @@ Requires-Dist: typer>=0.27.2
 
 # GreenLake Activate CLI
 
-The purpose of this is to help manage devices in HPE GreenLake Activate with an easy to use CLI interface.
+The purpose of this is to help manage devices in HPE GreenLake Activate with an easy to use CLI interface. This tool uses the available API calls that HPE GreenLake Activate exposes for manging devices
 
-# Setup
+## Features
+
+- Query Activate inventory by:
+    - device name
+    - mac address
+    - serial number
+    - folder name
+    - folder id
+- Move devices between folders
+- Generate CLI commands for allowlist entries (WIP)
 
 ## Requirements
 
-- Python 3.14 or newer
+- Python 3.12 or newer
 - An HPE GreenLake Activate API credential
 - Network access to `activate.arubanetworks.com`
 
-The CLI uses the following Python packages, which are installed automatically:
-
-- Typer
-- Requests
-- Rich
-- Python Dotenv
-
 ## Installation
 
 I recommend installing this package with `uv`. [Install uv](https://docs.astral.sh/uv/getting-started/installation/) if it is not already available.
@@ -57,13 +59,6 @@ Verify the installation:
 glcli --version
 ```
 
-This installs the CLI in an isolated environment and makes `glcli` available from
-any directory. If uv reports that its tool directory is not on your `PATH`, run:
-
-```sh
-uv tool update-shell
-```
-
 To upgrade or remove the installed CLI:
 
 ```sh
@@ -73,23 +68,22 @@ uv tool uninstall greenlake-activate-cli
 
 ### Install With Python and pip
 
-Create a virtual environment, activate it, and install the project from the cloned
-repository:
+Creating a virtual environment and installing the package:
 
 ```sh
-python3.14 -m venv .venv
-. .venv/bin/activate
-python -m pip install --upgrade pip
-python -m pip install .
+python3 -m venv .venv
+source .venv/bin/activate
+python3 -m pip install --upgrade pip
+python3 -m pip install greenlake-activate-cli
 ```
 
-The `glcli` command is then available directly:
+The `glcli` command is then available from the venv:
 
 ```sh
 glcli --version
 ```
 
-## Configure Credentials
+## Configuration 
 
 Run the CLI `glcli configure` command.
 
@@ -97,7 +91,7 @@ Run the CLI `glcli configure` command.
 glcli configure
 ```
 
-You will be prompted to enter your GreenLake Activate API token. This text is hidden.
+You will be prompted to enter (paste) in your GreenLake Activate API token. This text is hidden.
 
 This command is essentially doing this:
 
@@ -148,6 +142,20 @@ glcli query folder 5297450
 glcli query folder SiteA-South
 ```
 
+Move a device by serial number or MAC address:
+
+```sh
+glcli move PHWLKAS02 SiteA-South
+glcli move aa:bb:cc:00:11:22 5297450
+```
+
+Move multiple devices from a file:
+
+```sh
+glcli move serials serials.csv SiteA-South
+glcli move macs mac_addresses.csv 5297450
+```
+
 Serial numbers and MAC addresses can also be loaded from CSV or newline-delimited files:
 
 ```sh
@@ -155,9 +163,6 @@ glcli query serial --file serials.csv
 glcli query mac --file mac_addresses.csv
 ```
 
-The file reader uses the first column. Serial files may use a `serial`, `serialNumber`,
-`serial_number`, `serial number`, or `sn` header.
-
 Use `--verbose` for diagnostic logging:
 
 ```sh
@@ -166,3 +171,21 @@ glcli --verbose query serial PHWLKAS02
 
 Exit codes are `0` for a complete result, `1` when no devices are returned, and
 `2` when at least one requested identifier is missing.
+
+## Troubleshooting
+
+The installation with uv installs this package in an isolated environment and makes `glcli` available to run from any directory. If uv reports that its tool directory is not on your `PATH`, run:
+
+```sh
+uv tool update-shell
+```
+
+To run the tests;
+
+```sh
+uv run pytest
+```
+
+# References
+
+- [GreenLake Activate API Documentation](https://support.hpe.com/hpesc/public/docDisplay?docId=a00120791en_us&page=GUID-264278DA-9B2B-4E1E-9DED-596562E2CEF4.html)

{greenlake_activate_cli-0.2.2 → greenlake_activate_cli-0.3.0}/README.md

@@ -1,22 +1,24 @@
 # GreenLake Activate CLI
 
-The purpose of this is to help manage devices in HPE GreenLake Activate with an easy to use CLI interface.
+The purpose of this is to help manage devices in HPE GreenLake Activate with an easy to use CLI interface. This tool uses the available API calls that HPE GreenLake Activate exposes for manging devices
 
-# Setup
+## Features
+
+- Query Activate inventory by:
+    - device name
+    - mac address
+    - serial number
+    - folder name
+    - folder id
+- Move devices between folders
+- Generate CLI commands for allowlist entries (WIP)
 
 ## Requirements
 
-- Python 3.14 or newer
+- Python 3.12 or newer
 - An HPE GreenLake Activate API credential
 - Network access to `activate.arubanetworks.com`
 
-The CLI uses the following Python packages, which are installed automatically:
-
-- Typer
-- Requests
-- Rich
-- Python Dotenv
-
 ## Installation
 
 I recommend installing this package with `uv`. [Install uv](https://docs.astral.sh/uv/getting-started/installation/) if it is not already available.
@@ -46,13 +48,6 @@ Verify the installation:
 glcli --version
 ```
 
-This installs the CLI in an isolated environment and makes `glcli` available from
-any directory. If uv reports that its tool directory is not on your `PATH`, run:
-
-```sh
-uv tool update-shell
-```
-
 To upgrade or remove the installed CLI:
 
 ```sh
@@ -62,23 +57,22 @@ uv tool uninstall greenlake-activate-cli
 
 ### Install With Python and pip
 
-Create a virtual environment, activate it, and install the project from the cloned
-repository:
+Creating a virtual environment and installing the package:
 
 ```sh
-python3.14 -m venv .venv
-. .venv/bin/activate
-python -m pip install --upgrade pip
-python -m pip install .
+python3 -m venv .venv
+source .venv/bin/activate
+python3 -m pip install --upgrade pip
+python3 -m pip install greenlake-activate-cli
 ```
 
-The `glcli` command is then available directly:
+The `glcli` command is then available from the venv:
 
 ```sh
 glcli --version
 ```
 
-## Configure Credentials
+## Configuration 
 
 Run the CLI `glcli configure` command.
 
@@ -86,7 +80,7 @@ Run the CLI `glcli configure` command.
 glcli configure
 ```
 
-You will be prompted to enter your GreenLake Activate API token. This text is hidden.
+You will be prompted to enter (paste) in your GreenLake Activate API token. This text is hidden.
 
 This command is essentially doing this:
 
@@ -137,6 +131,20 @@ glcli query folder 5297450
 glcli query folder SiteA-South
 ```
 
+Move a device by serial number or MAC address:
+
+```sh
+glcli move PHWLKAS02 SiteA-South
+glcli move aa:bb:cc:00:11:22 5297450
+```
+
+Move multiple devices from a file:
+
+```sh
+glcli move serials serials.csv SiteA-South
+glcli move macs mac_addresses.csv 5297450
+```
+
 Serial numbers and MAC addresses can also be loaded from CSV or newline-delimited files:
 
 ```sh
@@ -144,9 +152,6 @@ glcli query serial --file serials.csv
 glcli query mac --file mac_addresses.csv
 ```
 
-The file reader uses the first column. Serial files may use a `serial`, `serialNumber`,
-`serial_number`, `serial number`, or `sn` header.
-
 Use `--verbose` for diagnostic logging:
 
 ```sh
@@ -155,3 +160,21 @@ glcli --verbose query serial PHWLKAS02
 
 Exit codes are `0` for a complete result, `1` when no devices are returned, and
 `2` when at least one requested identifier is missing.
+
+## Troubleshooting
+
+The installation with uv installs this package in an isolated environment and makes `glcli` available to run from any directory. If uv reports that its tool directory is not on your `PATH`, run:
+
+```sh
+uv tool update-shell
+```
+
+To run the tests;
+
+```sh
+uv run pytest
+```
+
+# References
+
+- [GreenLake Activate API Documentation](https://support.hpe.com/hpesc/public/docDisplay?docId=a00120791en_us&page=GUID-264278DA-9B2B-4E1E-9DED-596562E2CEF4.html)

{greenlake_activate_cli-0.2.2 → greenlake_activate_cli-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "greenlake-activate-cli"
-version = "0.2.2"
+version = "0.3.0"
 description = "A CLI tool used to interact with HPE GreenLake Activate"
 readme = "README.md"
 requires-python = ">=3.12"

{greenlake_activate_cli-0.2.2 → greenlake_activate_cli-0.3.0}/src/glcli/cli.py

@@ -7,6 +7,7 @@ from glcli.activate_login import create_activate_session, load_credentials, save
 from glcli.data_parsing import parse_inventory_response
 from glcli.query_inventory import query_inventory, read_identifiers_from_file
 from glcli.query_folder import resolve_folder_ids
+from glcli.move_device import move_device, resolve_move_macs, MAC_PATTERN
 from glcli.display_data import display_inventory_sn
 from rich.logging import RichHandler
 
@@ -98,6 +99,33 @@ def _query_folder(values: list[str]) -> None:
         raise typer.Exit(code=1)
 
 
+def _move(identifier_type: str, identifiers: list[str], destination: str) -> None:
+    identifiers = [identifier.strip().upper() for identifier in identifiers if identifier.strip()]
+    destination = destination.strip()
+    if not identifiers:
+        raise typer.BadParameter("At least one identifier is required")
+    if not destination:
+        raise typer.BadParameter("A destination folder is required")
+
+    identifiers = list(dict.fromkeys(identifiers))
+    credential = _load_credential()
+    session = None
+    try:
+        session = create_activate_session(credential)
+        mac_addresses, unresolved = resolve_move_macs(session, identifier_type, identifiers)
+        if unresolved:
+            typer.echo(f"Not found or missing MAC: {', '.join(unresolved)}", err=True)
+        if not mac_addresses:
+            raise typer.Exit(code=1)
+        move_device(session, mac_addresses, destination)
+    finally:
+        if session is not None:
+            session.close()
+
+    if unresolved:
+        raise typer.Exit(code=2)
+
+
 @app.callback()
 def main_callback(
     verbose: bool = typer.Option(False, "--verbose", "-v", help="Enable debugging output to console."),
@@ -117,6 +145,41 @@ def configure() -> None:
     typer.echo(f"Credential saved to {config_path}")
 
 
+@app.command("move")
+def move(
+    arguments: list[str] = typer.Argument(..., metavar="MOVE_ARGUMENT"),
+) -> None:
+    """Move a device or a file of devices to an Activate folder.
+
+    Forms:
+        move IDENTIFIER DESTINATION
+        move serials FILE DESTINATION
+        move macs FILE DESTINATION
+
+    examples:
+        move SERIALNO12 Site_A
+        move AA:BB:CC:DD:EE:FF Site_B
+        move serials ./serials.csv Site_C
+        move macs ./macs.csv Site_D
+
+    """
+    if arguments[0] in {"serials", "macs"}:
+        if len(arguments) != 3:
+            raise typer.BadParameter("Expected: move serials|macs FILENAME DESTINATION")
+        identifier_type = "serial" if arguments[0] == "serials" else "mac"
+        try:
+            identifiers = read_identifiers_from_file(Path(arguments[1]), identifier_type)
+        except (OSError, ValueError) as exc:
+            raise typer.BadParameter(str(exc)) from exc
+        _move(identifier_type, identifiers, arguments[2])
+        return
+
+    if len(arguments) != 2:
+        raise typer.BadParameter("Expected: move IDENTIFIER DESTINATION")
+    identifier_type = "mac" if MAC_PATTERN.fullmatch(arguments[0].strip()) else "serial"
+    _move(identifier_type, [arguments[0]], arguments[1])
+
+
 @query_app.command("serial")
 def query_serial(
     serials: list[str] | None = typer.Argument(None, metavar="SERIAL"),

greenlake_activate_cli-0.3.0/src/glcli/move_device.py

@@ -0,0 +1,71 @@
+import requests
+import json
+import logging
+import re
+
+from glcli.query_inventory import query_inventory
+
+logger = logging.getLogger(__name__)
+UPDATE_INVENTORY_URL = "https://activate.arubanetworks.com/api/ext/inventory.json?action=update"
+REQUEST_TIMEOUT = 30
+MAC_PATTERN = re.compile(r"^(?:[0-9A-F]{2}:){5}[0-9A-F]{2}$", re.IGNORECASE)
+
+def move_device(
+    session: requests.Session,
+    mac_addresses: list[str],
+    destination_folder: str,
+) -> str:
+    """Move MAC addresses to a folder name or numeric folder ID."""
+    if not mac_addresses:
+        raise ValueError("At least one MAC address is required")
+    destination_folder = destination_folder.strip()
+    if not destination_folder:
+        raise ValueError("A destination folder is required")
+
+    destination_key = "folderId" if destination_folder.isdigit() else "folderName"
+    payload = {
+        "devices": [
+            {"mac": mac, destination_key: destination_folder}
+            for mac in mac_addresses
+        ]
+    }
+    raw_data = f"json={json.dumps(payload)}"
+    logger.debug("Move request: %s", raw_data)
+    response = session.post(UPDATE_INVENTORY_URL, data=raw_data, timeout=REQUEST_TIMEOUT)
+    if response.status_code != 200:
+        logger.error("Move failed with status code: %s", response.status_code)
+        raise RuntimeError("Inventory move failed")
+
+    logger.info("Moved %d device(s) to %s", len(mac_addresses), destination_folder)
+    return response.text
+
+
+def resolve_move_macs(
+    session: requests.Session,
+    identifier_type: str,
+    identifiers: list[str],
+) -> tuple[list[str], list[str]]:
+    """Resolve valid serial or MAC identifiers to canonical MAC addresses."""
+    if identifier_type not in {"serial", "mac"}:
+        raise ValueError(f"Unsupported move identifier type: {identifier_type}")
+
+    response_text, missing = query_inventory(session, identifier_type, identifiers)
+    try:
+        response = json.loads(response_text)
+    except json.JSONDecodeError as exc:
+        raise RuntimeError("Activate returned invalid inventory JSON") from exc
+
+    resolved: list[str] = []
+    unresolved = list(missing)
+    for device in response.get("devices", []):
+        if not isinstance(device, dict):
+            continue
+        mac = str(device.get("mac") or "").strip().upper()
+        if not MAC_PATTERN.fullmatch(mac):
+            identifier = device.get("serialNumber") if identifier_type == "serial" else device.get("mac")
+            if identifier:
+                unresolved.append(str(identifier))
+            continue
+        resolved.append(mac)
+
+    return list(dict.fromkeys(resolved)), list(dict.fromkeys(unresolved))

{greenlake_activate_cli-0.2.2 → greenlake_activate_cli-0.3.0}/src/greenlake_activate_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: greenlake-activate-cli
-Version: 0.2.2
+Version: 0.3.0
 Summary: A CLI tool used to interact with HPE GreenLake Activate
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -11,23 +11,25 @@ Requires-Dist: typer>=0.27.2
 
 # GreenLake Activate CLI
 
-The purpose of this is to help manage devices in HPE GreenLake Activate with an easy to use CLI interface.
+The purpose of this is to help manage devices in HPE GreenLake Activate with an easy to use CLI interface. This tool uses the available API calls that HPE GreenLake Activate exposes for manging devices
 
-# Setup
+## Features
+
+- Query Activate inventory by:
+    - device name
+    - mac address
+    - serial number
+    - folder name
+    - folder id
+- Move devices between folders
+- Generate CLI commands for allowlist entries (WIP)
 
 ## Requirements
 
-- Python 3.14 or newer
+- Python 3.12 or newer
 - An HPE GreenLake Activate API credential
 - Network access to `activate.arubanetworks.com`
 
-The CLI uses the following Python packages, which are installed automatically:
-
-- Typer
-- Requests
-- Rich
-- Python Dotenv
-
 ## Installation
 
 I recommend installing this package with `uv`. [Install uv](https://docs.astral.sh/uv/getting-started/installation/) if it is not already available.
@@ -57,13 +59,6 @@ Verify the installation:
 glcli --version
 ```
 
-This installs the CLI in an isolated environment and makes `glcli` available from
-any directory. If uv reports that its tool directory is not on your `PATH`, run:
-
-```sh
-uv tool update-shell
-```
-
 To upgrade or remove the installed CLI:
 
 ```sh
@@ -73,23 +68,22 @@ uv tool uninstall greenlake-activate-cli
 
 ### Install With Python and pip
 
-Create a virtual environment, activate it, and install the project from the cloned
-repository:
+Creating a virtual environment and installing the package:
 
 ```sh
-python3.14 -m venv .venv
-. .venv/bin/activate
-python -m pip install --upgrade pip
-python -m pip install .
+python3 -m venv .venv
+source .venv/bin/activate
+python3 -m pip install --upgrade pip
+python3 -m pip install greenlake-activate-cli
 ```
 
-The `glcli` command is then available directly:
+The `glcli` command is then available from the venv:
 
 ```sh
 glcli --version
 ```
 
-## Configure Credentials
+## Configuration 
 
 Run the CLI `glcli configure` command.
 
@@ -97,7 +91,7 @@ Run the CLI `glcli configure` command.
 glcli configure
 ```
 
-You will be prompted to enter your GreenLake Activate API token. This text is hidden.
+You will be prompted to enter (paste) in your GreenLake Activate API token. This text is hidden.
 
 This command is essentially doing this:
 
@@ -148,6 +142,20 @@ glcli query folder 5297450
 glcli query folder SiteA-South
 ```
 
+Move a device by serial number or MAC address:
+
+```sh
+glcli move PHWLKAS02 SiteA-South
+glcli move aa:bb:cc:00:11:22 5297450
+```
+
+Move multiple devices from a file:
+
+```sh
+glcli move serials serials.csv SiteA-South
+glcli move macs mac_addresses.csv 5297450
+```
+
 Serial numbers and MAC addresses can also be loaded from CSV or newline-delimited files:
 
 ```sh
@@ -155,9 +163,6 @@ glcli query serial --file serials.csv
 glcli query mac --file mac_addresses.csv
 ```
 
-The file reader uses the first column. Serial files may use a `serial`, `serialNumber`,
-`serial_number`, `serial number`, or `sn` header.
-
 Use `--verbose` for diagnostic logging:
 
 ```sh
@@ -166,3 +171,21 @@ glcli --verbose query serial PHWLKAS02
 
 Exit codes are `0` for a complete result, `1` when no devices are returned, and
 `2` when at least one requested identifier is missing.
+
+## Troubleshooting
+
+The installation with uv installs this package in an isolated environment and makes `glcli` available to run from any directory. If uv reports that its tool directory is not on your `PATH`, run:
+
+```sh
+uv tool update-shell
+```
+
+To run the tests;
+
+```sh
+uv run pytest
+```
+
+# References
+
+- [GreenLake Activate API Documentation](https://support.hpe.com/hpesc/public/docDisplay?docId=a00120791en_us&page=GUID-264278DA-9B2B-4E1E-9DED-596562E2CEF4.html)

{greenlake_activate_cli-0.2.2 → greenlake_activate_cli-0.3.0}/src/greenlake_activate_cli.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ src/glcli/activate_login.py
 src/glcli/cli.py
 src/glcli/data_parsing.py
 src/glcli/display_data.py
+src/glcli/move_device.py
 src/glcli/query_folder.py
 src/glcli/query_inventory.py
 src/greenlake_activate_cli.egg-info/PKG-INFO
@@ -17,5 +18,7 @@ tests/test_activate_login.py
 tests/test_cli.py
 tests/test_configure.py
 tests/test_data_parsing.py
+tests/test_move_cli.py
+tests/test_move_device.py
 tests/test_query_folder.py
 tests/test_query_inventory.py

greenlake_activate_cli-0.3.0/tests/test_move_cli.py

@@ -0,0 +1,90 @@
+from typer.testing import CliRunner
+
+from glcli import cli
+
+
+class FakeSession:
+    def __init__(self):
+        self.closed = False
+
+    def close(self):
+        self.closed = True
+
+
+def test_direct_serial_move_resolves_and_updates(monkeypatch):
+    runner = CliRunner()
+    session = FakeSession()
+    captured = {}
+
+    monkeypatch.setattr(cli, "load_credentials", lambda: "token")
+    monkeypatch.setattr(cli, "create_activate_session", lambda credential: session)
+    monkeypatch.setattr(
+        cli,
+        "resolve_move_macs",
+        lambda active_session, identifier_type, identifiers: (["AA:BB:CC:DD:EE:FF"], []),
+    )
+    monkeypatch.setattr(
+        cli,
+        "move_device",
+        lambda active_session, macs, destination: captured.update(
+            macs=macs, destination=destination
+        ),
+    )
+
+    result = runner.invoke(cli.app, ["move", "SN1", "Northwest"])
+
+    assert result.exit_code == 0
+    assert captured == {"macs": ["AA:BB:CC:DD:EE:FF"], "destination": "Northwest"}
+    assert session.closed is True
+
+
+def test_mac_file_move_uses_mac_identifier_type(monkeypatch, tmp_path):
+    runner = CliRunner()
+    captured = {}
+    mac_file = tmp_path / "macs.txt"
+    mac_file.write_text("aa:bb:cc:dd:ee:ff\n")
+
+    monkeypatch.setattr(cli, "load_credentials", lambda: "token")
+    monkeypatch.setattr(cli, "create_activate_session", lambda credential: FakeSession())
+    monkeypatch.setattr(cli, "read_identifiers_from_file", lambda path, kind: ["AA:BB:CC:DD:EE:FF"])
+    monkeypatch.setattr(
+        cli,
+        "resolve_move_macs",
+        lambda active_session, identifier_type, identifiers: (["AA:BB:CC:DD:EE:FF"], []),
+    )
+    monkeypatch.setattr(
+        cli,
+        "move_device",
+        lambda active_session, macs, destination: captured.update(
+            macs=macs, destination=destination
+        ),
+    )
+
+    result = runner.invoke(cli.app, ["move", "macs", str(mac_file), "5297450"])
+
+    assert result.exit_code == 0
+    assert captured["macs"] == ["AA:BB:CC:DD:EE:FF"]
+    assert captured["destination"] == "5297450"
+
+
+def test_move_continues_with_valid_devices(monkeypatch):
+    runner = CliRunner()
+    captured = {}
+
+    monkeypatch.setattr(cli, "load_credentials", lambda: "token")
+    monkeypatch.setattr(cli, "create_activate_session", lambda credential: FakeSession())
+    monkeypatch.setattr(
+        cli,
+        "resolve_move_macs",
+        lambda active_session, identifier_type, identifiers: (["AA:BB:CC:DD:EE:FF"], ["SN2"]),
+    )
+    monkeypatch.setattr(
+        cli,
+        "move_device",
+        lambda active_session, macs, destination: captured.update(macs=macs),
+    )
+
+    result = runner.invoke(cli.app, ["move", "SN1", "Northwest"])
+
+    assert result.exit_code == 2
+    assert captured["macs"] == ["AA:BB:CC:DD:EE:FF"]

greenlake_activate_cli-0.3.0/tests/test_move_device.py

@@ -0,0 +1,62 @@
+import json
+
+import pytest
+
+from glcli.move_device import move_device, resolve_move_macs
+
+
+class FakeResponse:
+    def __init__(self, body, status_code=200):
+        self.text = json.dumps(body) if not isinstance(body, str) else body
+        self.status_code = status_code
+
+
+class FakeSession:
+    def __init__(self, responses):
+        self.responses = iter(responses)
+        self.calls = []
+
+    def post(self, url, data, timeout):
+        self.calls.append((url, data, timeout))
+        return next(self.responses)
+
+
+def test_move_uses_folder_name_payload_and_session():
+    session = FakeSession([FakeResponse({"message": {"code": 0}})])
+
+    move_device(session, ["AA:BB:CC:DD:EE:FF"], "Northwest")
+
+    assert json.loads(session.calls[0][1].removeprefix("json=")) == {
+        "devices": [{"mac": "AA:BB:CC:DD:EE:FF", "folderName": "Northwest"}]
+    }
+
+
+def test_move_uses_folder_id_payload_for_numeric_destination():
+    session = FakeSession([FakeResponse({"message": {"code": 0}})])
+
+    move_device(session, ["AA:BB:CC:DD:EE:FF", "11:22:33:44:55:66"], "5297450")
+
+    assert json.loads(session.calls[0][1].removeprefix("json=")) == {
+        "devices": [
+            {"mac": "AA:BB:CC:DD:EE:FF", "folderId": "5297450"},
+            {"mac": "11:22:33:44:55:66", "folderId": "5297450"},
+        ]
+    }
+
+
+def test_resolve_serials_to_macs():
+    session = FakeSession([
+        FakeResponse({"devices": [{"serialNumber": "SN1", "mac": "AA:BB:CC:DD:EE:FF"}]}),
+    ])
+
+    macs, missing = resolve_move_macs(session, "serial", ["SN1"])
+
+    assert macs == ["AA:BB:CC:DD:EE:FF"]
+    assert missing == []
+
+
+def test_move_rejects_failed_update():
+    session = FakeSession([FakeResponse({"error": "failed"}, status_code=500)])
+
+    with pytest.raises(RuntimeError, match="move failed"):
+        move_device(session, ["AA:BB:CC:DD:EE:FF"], "Northwest")