centralcli 7.2.4__tar.gz → 7.2.6__tar.gz

{centralcli-7.2.4 → centralcli-7.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: centralcli
-Version: 7.2.4
+Version: 7.2.6
 Summary: A CLI for interacting with Aruba Central (Cloud Management Platform).  Facilitates bulk imports, exports, reporting.  A handy tool if you have devices managed by Aruba Central.
 Home-page: https://github.com/Pack3tL0ss/central-api-cli
 License: MIT

{centralcli-7.2.4 → centralcli-7.2.6}/centralcli/cache.py

@@ -2356,9 +2356,10 @@ class Cache:
         """Update Device Database (local cache).
 
         If data is provided it's asumed to be a partial update.  No devices will be removed from the cache unless remove=True.
+
         Args:
-            data (List[Dict[str, Any]] | Dict[str, Any] | List[int] | int): Device data to update cache with.  Existing devices are
-                retained and updated with any changes from the new data provided.
+            data (List[Dict[str, Any]] | Dict[str, Any] | List[int] | int): Device data to update cache with.
+                Existing devices are retained and updated with any changes from the new data provided.
             remove (bool, optional): Set True to remove devices from cache, data should be a list of doc_ids (int).
 
         Returns:

{centralcli-7.2.4 → centralcli-7.2.6}/centralcli/central.py

@@ -4524,7 +4524,7 @@ class CentralApi(Session):
     ) -> Response:
         """Delete devices using Serial number.  Only applies to CoP deployments.
 
-        Device can not be archived in CoP inventoryI
+        Device can not be archived in CoP inventory.
 
         Args:
             devices (list, optional): List of devices to be deleted from
@@ -5378,7 +5378,7 @@ class CentralApi(Session):
     async def get_brach_health(
         self,
         name: str = None,
-        column: int = None,
+        column: int = None,  # NEXT-MAJOR remove or make consistent with other parameters (sort)
         reverse: bool = False,
         filters: dict = {},
         offset: int = 0,
@@ -5499,7 +5499,7 @@ class CentralApi(Session):
         """Get all portals with limited data.
 
         Args:
-            sort (str, optional): + is for ascending  and - for descending order, Valid Values: name prepended with + or - i.e. +name.
+            sort (str, optional): `+` is for ascending  and `-` for descending order, Valid Values: name prepended with `+` or `-` i.e. +name.
                 Defaults to None.  Which results in use of API default +name.
             offset (int, optional): Starting index of element for a paginated query Defaults to 0.
             limit (int, optional): Number of items required per query Defaults to 100.

{centralcli-7.2.4 → centralcli-7.2.6}/centralcli/cli.py

@@ -585,21 +585,24 @@ def archive(
 
     Just use cencli deleve device ... or cencli batch delete devices
     """
-    devices: List[CentralObject] = [cli.cache.get_dev_identifier(dev, silent=True, include_inventory=True) for dev in devices]
-
-    # TODO add confirmation method builder to output class
+    _emsg = ""
     _msg = "[bright_green]Archive devices[/]:"
-    if len(devices) > 1:
-        _dev_msg = '\n    '.join([dev.rich_help_text for dev in devices])
-        _msg = f"{_msg}\n    {_dev_msg}\n"
-    else:
-        dev = devices[0]
-        _msg = f"{_msg} {dev.rich_help_text}"
+    serials = []
+    cache_devs: List[CentralObject] = [cli.cache.get_dev_identifier(dev, silent=True, include_inventory=True, exit_on_fail=False) for dev in devices]
+    for dev_in, cache_dev in zip(devices, cache_devs):
+        if cache_dev:
+            _msg = f"{_msg}\n    {cache_dev.rich_help_text}"
+            serials += [cache_dev.serial]
+        elif cache_dev is None and not utils.is_serial(dev_in):
+            _emsg = f"{_emsg}\n    [dark_orange3]\u26a0[/]  [red]Skipping[/] [cyan]{dev_in}[/].  Not found in Cache and does not appear to be a serial number."
+        else:
+            _msg = f"{_msg}\n    {dev_in}"
+            serials += [dev_in]
 
     console = Console(emoji=False)
-    console.print(_msg)
+    console.print(_msg, _emsg, sep="\n")
     if cli.confirm(yes):
-        resp = cli.central.request(cli.central.archive_devices, [d.serial for d in devices])
+        resp = cli.central.request(cli.central.archive_devices, serials)
         cli.display_results(resp, tablefmt="action")
 
 

{centralcli-7.2.4 → centralcli-7.2.6}/centralcli/clicommon.py

@@ -1472,6 +1472,7 @@ class CLICommon:
         not_found_devs: List[str] = [s for s, c in zip(serials_in, cache_devs) if c is None]
         cache_found_devs: List[CacheDevice | CacheInvDevice] = [d for d in cache_devs if d]
         cache_mon_devs: List[CacheDevice] = [d for d in cache_found_devs if d.db.name == "devices"]
+        cache_inv_devs: List[CacheInvDevice] = [d for d in cache_found_devs if d.db.name == "inventory"]
 
 
         # archive / unarchive removes any subscriptions (less calls than determining the subscriptions for each then unsubscribing)
@@ -1488,12 +1489,12 @@ class CLICommon:
             mon_del_reqs, delayed_mon_del_reqs = self._build_mon_del_reqs(cache_mon_devs)
 
         # cop only delete devices from GreenLake inventory
-        cop_del_reqs = [] if not config.is_cop or not serials_in else [
-            BR(self.central.cop_delete_device_from_inventory, serials_in)
+        cop_del_reqs = [] if not config.is_cop or not cache_inv_devs else [
+            BR(self.central.cop_delete_device_from_inventory, [dev.serial for dev in cache_inv_devs])
         ]
 
         # warn about devices that were not found
-        if (mon_del_reqs or delayed_mon_del_reqs) and not_found_devs:
+        if (mon_del_reqs or delayed_mon_del_reqs or cop_del_reqs) and not_found_devs:
             not_in_inv_msg = utils.color(not_found_devs, color_str="cyan", pad_len=4, sep="\n")
             self.econsole.print(f"\n[dark_orange3]\u26a0[/]  The following provided devices were not found in the inventory.\n{not_in_inv_msg}", emoji=False)
             self.econsole.print("[grey42 italic]They will be skipped[/]\n")

{centralcli-7.2.4 → centralcli-7.2.6}/centralcli/response.py

@@ -384,7 +384,7 @@ class Response:
 
         r = r.replace("failed:", "[red]failed[/]:").replace("FAILED", "[red]FAILED[/red]").replace("failed_devices", "[red]failed_devices[/]").replace("INVALID", "[red]INVALID[/]")
         r = r.replace("SUCCESS", "[bright_green]SUCCESS[/]").replace("Success", "[bright_green]Success[/]").replace("Success[/]fully", "Successfully[/]")
-        r = r.replace("Success", "[bright_green]Success[/]").replace("success", "[bright_green]success[/]").replace("succeeded_devices", "[bright_green]succeeded_devices[/]")
+        r = r.replace("Success", "[bright_green]Success[/]").replace("success", "[bright_green]success[/]").replace("success[/]fully", "successfully[/]").replace("succeeded_devices", "[bright_green]succeeded_devices[/]")
         r = r.replace("invalid_device", "[red]invalid_device[/]").replace("blocked_device", "[red]blocked_device[/red]").replace("ATHENA_ERROR_DEVICE_ALREADY_EXIST", "[italic dark_orange3]Device already exists[/]")
 
         # sanitize sensitive data for demos

{centralcli-7.2.4 → centralcli-7.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "centralcli"
-version = "7.2.4"
+version = "7.2.6"
 description = "A CLI for interacting with Aruba Central (Cloud Management Platform).  Facilitates bulk imports, exports, reporting.  A handy tool if you have devices managed by Aruba Central."
 license = "MIT"
 authors = ["Wade Wells (Pack3tL0ss) <wade@consolepi.org>"]