centralcli 2.3.2__tar.gz → 2.3.4__tar.gz

{centralcli-2.3.2 → centralcli-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: centralcli
-Version: 2.3.2
+Version: 2.3.4
 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-2.3.2 → centralcli-2.3.4}/centralcli/cli.py

@@ -42,7 +42,7 @@ except (ImportError, ModuleNotFoundError) as e:
 
 from centralcli.cache import CentralObject
 from centralcli.central import CentralApi  # noqa
-from centralcli.constants import (BlinkArgs, BounceArgs, IdenMetaVars, StartArgs, ResetArgs)
+from centralcli.constants import (BlinkArgs, BounceArgs, IdenMetaVars, StartArgs, ResetArgs, EnableDisableArgs)
 
 iden = IdenMetaVars()
 
@@ -715,6 +715,78 @@ def unarchive(
     cli.display_results(resp, tablefmt="action")
 
 
+@app.command(hidden=True)
+def enable(
+    what: EnableDisableArgs = typer.Argument("auto-sub"),
+    services: List[cli.cache.LicenseTypes] = typer.Argument(..., show_default=False),
+    yes: bool = typer.Option(False, "-Y", "-y", help="Bypass confirmation prompts - Assume Yes"),
+    debug: bool = typer.Option(False, "--debug", envvar="ARUBACLI_DEBUG", help="Enable Additional Debug Logging",),
+    default: bool = typer.Option(False, "-d", is_flag=True, help="Use default central account", show_default=False,),
+    account: str = typer.Option("central_info",
+                                envvar="ARUBACLI_ACCOUNT",
+                                help="The Aruba Central Account to use (must be defined in the config)",
+                                autocompletion=cli.cache.account_completion),
+) -> None:
+    """Enable auto subscribe for service.
+
+    Enabling auto subscribe sets the level (i.e. foundation/advanced) for all devices of the same type as the subscription provided.
+    i.e. `enable auto-sub advanced-switch-6300` will enable auto subscribe for all switch tiers (6100, 6200, etc)
+    """
+
+    _msg = f"[bright_green]Enable[/] auto-subscribe for license"
+    if len(services) > 1:
+        _svc_msg = '\n    '.join([s.name for s in services])
+        _msg = f'{_msg}s:\n    {_svc_msg}\n'
+    else:
+        svc = services[0]
+        _msg = f'{_msg} {svc.name}'
+    print(_msg)
+    print('\n[dark_orange]!![/] Enabling auto-subscribe applies the specified tier (i.e. foundation/advanced) for [green bold]all[/] devices of the same type.')
+    print(f'[cyan]enable auto-sub advanced-switch-6300[/] will result in [green bold]all[/] switch models being set to auto-subscribe the advanced license appropriate for that model.')
+    print(f'Not just the 6300 models.')
+    if yes or typer.confirm("\nProceed?", abort=True):
+        services = [s.name for s in services]
+
+        resp = cli.central.request(cli.central.enable_auto_subscribe, services=services)
+        cli.display_results(resp, tablefmt="action")
+
+
+@app.command(hidden=True)
+def disable(
+    what: EnableDisableArgs = typer.Argument("auto-sub"),
+    services: List[cli.cache.LicenseTypes] = typer.Argument(..., show_default=False),
+    yes: bool = typer.Option(False, "-Y", "-y", help="Bypass confirmation prompts - Assume Yes"),
+    debug: bool = typer.Option(False, "--debug", envvar="ARUBACLI_DEBUG", help="Enable Additional Debug Logging",),
+    default: bool = typer.Option(False, "-d", is_flag=True, help="Use default central account", show_default=False,),
+    account: str = typer.Option("central_info",
+                                envvar="ARUBACLI_ACCOUNT",
+                                help="The Aruba Central Account to use (must be defined in the config)",
+                                autocompletion=cli.cache.account_completion),
+) -> None:
+    """Disable auto subscribe for service.
+
+    Disabling auto subscribe removes auto-subscribe for all models of the same type.
+    i.e. `disable auto-sub advanced-switch-6300` will disable auto subscribe for all switch tiers (6100, 6200, etc)
+    """
+
+    _msg = f"[bright_green]Disable[/] auto-subscribe for license"
+    if len(services) > 1:
+        _svc_msg = '\n    '.join([s.name for s in services])
+        _msg = f'{_msg}s:\n    {_svc_msg}\n'
+    else:
+        svc = services[0]
+        _msg = f'{_msg} {svc.name}'
+    print(_msg)
+    print('\n[dark_orange]!![/] Disabling auto subscribe removes auto-subscribe for all models of the same type.')
+    print(f'[cyan]disable auto-sub advanced-switch-6300[/] will result in auto-subscribe being disabled for [green bold]all[/] switch models.')
+    print(f'Not just the 6300.')
+    if yes or typer.confirm("\nProceed?", abort=True):
+        services = [s.name for s in services]
+
+        resp = cli.central.request(cli.central.enable_auto_subscribe, services=services)
+        cli.display_results(resp, tablefmt="action")
+
+
 @app.command(short_help="convert j2 templates")
 def convert(
     template: Path = typer.Argument(..., help="j2 template to convert", exists=True),

{centralcli-2.3.2 → centralcli-2.3.4}/centralcli/cliassign.py

@@ -24,6 +24,7 @@ except (ImportError, ModuleNotFoundError) as e:
 app = typer.Typer()
 
 
+# TODO consider removing auto option as we've added enable/disable auto-sub ...
 @app.command()
 def license(
     license: cli.cache.LicenseTypes = typer.Argument(..., show_default=False),

{centralcli-2.3.2 → centralcli-2.3.4}/centralcli/clibatch.py

@@ -1069,7 +1069,7 @@ def batch_delete_devices(data: Union[list, dict], *, ui_only: bool = False, yes:
         if not all([r.ok for r in batch_resp]):
             console.print("[bright_red]A Failure occured aborting remaining actions.[/]")
             console.print("[italic]Cache has not been updated, [cyan]cencli show all -v[/ cyan] will result in a full cache update.[/ italic]")
-            cli.display_results(batch_resp, exit_on_fail=True, caption="Re-run command to perform remaining actions.")
+            cli.display_results(batch_resp, exit_on_fail=True, caption="Re-run command to perform remaining actions.", tablefmt="action")
 
     if not delayed_mon_del_reqs and not cop_del_reqs:
         # if all reqs OK cache is updated by deleting specific items, otherwise it's a full cache refresh

{centralcli-2.3.2 → centralcli-2.3.4}/centralcli/clicommon.py

@@ -177,14 +177,18 @@ class CLICommon:
         if ctx is not None and ctx.resilient_parsing:  # tab completion, return without validating
             return
 
-        current = pkg_resources.get_distribution('centralcli').version
+        try:
+            current = pkg_resources.get_distribution('centralcli').version
+        except pkg_resources.DistributionNotFound:
+            current = "0.0.0  !! Unable to gather version"
         resp = self.central.request(self.central.get, "https://pypi.org/pypi/centralcli/json")
         if not resp:
             print(current)
         else:
-            major = max([int(str(k).split(".")[0]) for k in resp.output["releases"].keys() if "a" not in k and k.count(".") < 2])
-            minor = max([int(str(k).split(".")[1]) for k in resp.output["releases"].keys() if "a" not in k and k.count(".") == 1 and int(str(k).split(".")[0]) == major])
-            latest = f'{major}.{minor}'
+            # major = max([int(str(k).split(".")[0]) for k in resp.output["releases"].keys() if "a" not in k and k.count(".") < 3])
+            # minor = max([int(str(k).split(".")[1]) for k in resp.output["releases"].keys() if "a" not in k and k.count(".") == 1 and int(str(k).split(".")[0]) == major])
+            # latest = f'{major}.{minor}'
+            latest = max(resp.output["releases"])
             msg = "[bold bright_green]centralcli[/] "
             msg += 'A CLI app for interacting with Aruba Central Cloud Management Platform.\n'
             msg += f'Brought to you by [cyan]{resp.output["info"]["author"]}[/]\n\n'

{centralcli-2.3.2 → centralcli-2.3.4}/centralcli/constants.py

@@ -295,6 +295,11 @@ class BatchRenameArgs(str, Enum):
     groups = "groups"
 
 
+class EnableDisableArgs(str, Enum):
+    auto_sub = "auto-sub"
+
+
+
 class DhcpArgs(str, Enum):
     clients = "clients"
     server = "server"

{centralcli-2.3.2 → centralcli-2.3.4}/centralcli/objects.py

@@ -6,6 +6,7 @@ from typing import Literal
 from json import JSONEncoder
 from enum import Enum
 import pendulum
+from pathlib import Path
 
 
 TimeFormat = Literal["day-datetime", "durwords", "durwords-short", "timediff", "mdyt", "log"]
@@ -122,5 +123,5 @@ class Encoder(JSONEncoder):
     A Custom JSON Encoder to handle custom DateTime object during JSON serialization.
     """
     def default(self, o):
-        return o if not isinstance(o, DateTime) else str(o)
+        return o if not isinstance(o, DateTime) and not isinstance(o, Path) else str(o)
 

{centralcli-2.3.2 → centralcli-2.3.4}/centralcli/wh_proxy.py

@@ -254,7 +254,7 @@ def verify_header_auth(data: dict, svc: str, sig: str, ts: str, del_id: str):
     received from Aruba Central via Webhooks
     """
     # Token obtained from Aruba Central Webhooks page as provided in the input
-    token = config.tokens["webhook_token"]
+    token = config.tokens.get("webhook_token")
     if token:
         log.warning(
             f"Deprication Warning: webhook_token is depricated and will be removed in a future release. webhook now has it's own key under the account, refer to documentation to adjust config.yaml",

{centralcli-2.3.2 → centralcli-2.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "centralcli"
-version = "2.3.2"
+version = "2.3.4"
 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>"]