centralcli 5.2.1__tar.gz → 5.2.2__tar.gz

{centralcli-5.2.1 → centralcli-5.2.2}/PKG-INFO

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

@@ -2784,6 +2784,8 @@ class CentralApi(Session):
         return await self.post(url, json_data=json_data)
 
     # API-FLAW add ap and gw to group with gw-role as wlan and upgrade to aos10.  Returns 200, but no changes made
+    # TODO need to add flag for SD_WAN_Gateway architecture (Silver Peak), only valid associated GwNetworkRole is VPNConcentrator
+    # TODO need to add SD_WAN_Gateway to AllowedDevTypes
     async def update_group_properties(
         self,
         group: str,
@@ -2794,7 +2796,7 @@ class CentralApi(Session):
         microbranch: bool = None,
         gw_role: constants.GatewayRole = None,
         monitor_only_sw: bool = None,
-        monitor_only_cx: bool = None,  # Not supported by central yet
+        monitor_only_cx: bool = None,
     ) -> Response:
         """Update properties for the given group.
 
@@ -2822,7 +2824,7 @@ class CentralApi(Session):
             microbranch (bool): True to enable Microbranch network role for APs is applicable only for AOS10 architecture.
             gw_role (GatewayRole): Gateway role valid values "branch", "vpnc", "wlan" ("wlan" only valid on AOS10 group)
             monitor_only_sw: Monitor only ArubaOS-SW switches, applies to UI group only
-            monitor_only_cx: Monitor only ArubaOS-CX switches, applies to UI group only (Future capability)
+            monitor_only_cx: Monitor only ArubaOS-CX switches, applies to UI group only
 
         Returns:
             Response: CentralAPI Response object
@@ -2906,7 +2908,6 @@ class CentralApi(Session):
             mon_only_switches += ["AOS_S"]
         if monitor_only_cx:
             mon_only_switches += ["AOS_CX"]
-            raise NotImplementedError("AOS_CX Monitor Only not supported in Central yet.")
 
         arch = None
         if microbranch is not None:

{centralcli-5.2.1 → centralcli-5.2.2}/centralcli/cleaner.py

@@ -13,7 +13,7 @@ import sys
 import json
 from enum import Enum
 from pathlib import Path
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, Literal
 
 import pendulum
 from rich.console import Console
@@ -1774,9 +1774,10 @@ def cloudauth_get_namedmpsk(data: List[Dict[str, Any]], verbosity: int = 0,) ->
 def show_all_ap_lldp_neighbors_for_site(data):
     data = utils.unlistify(data)
     # TODO circular import if placed at top review import logic
-    from centralcli import cache
-    aps_in_cache = [dev["serial"] for dev in cache.devices if dev["type"] == "ap"]
-    ap_connections = [edge for edge in data["edges"] if edge["toIf"]["serial"] in aps_in_cache]
+    # from centralcli import cache
+    # aps_in_cache = [dev["serial"] for dev in cache.devices if dev["type"] == "ap"]
+    aps_in_site = [dev.get("serial") for dev in data["devices"] if dev["role"] == "IAP"]
+    ap_connections = [edge for edge in data["edges"] if edge["toIf"]["serial"] in aps_in_site]
     data = [
         {
             "ap": x["toIf"].get("deviceName", "--"),
@@ -1790,9 +1791,41 @@ def show_all_ap_lldp_neighbors_for_site(data):
             "switch_serial": x["fromIf"].get("serial", "--"),
             "switch_port": x["fromIf"].get("name", "--"),
             "untagged_vlan": x["fromIf"].get("untaggedVlan", "--"),
-            "tagged_vlans": ",".join([str(v) for v in x["fromIf"].get("taggedVlans") or [] if v != x["fromIf"].get("untaggedVlan", 9999)]),
+            "tagged_vlans": ",".join([str(v) for v in sorted(x["fromIf"].get("taggedVlans") or []) if v != x["fromIf"].get("untaggedVlan", 9999)]),
             "healthy": "✅" if x.get("health", "") == "good" else "❌"
         } for x in ap_connections
     ]
 
+    return simple_kv_formatter(data)
+
+
+def show_all_ap_lldp_neighbors_for_sitev2(data, filter: Literal["up", "down"] = None):
+    data = utils.unlistify(data)
+    # TODO circular import if placed at top review import logic
+    from centralcli import cache
+    # switches_in_cache = [dev["serial"] for dev in cache.devices if dev["type"] in ["cx", "sw"]]
+    if filter is None:
+        aps_in_site = {dev["serial"]: dev for dev in data["devices"] if dev["role"] == "IAP"}
+    else:
+        status = 0 if filter == "down" else 1
+        aps_in_site = {dev["serial"]: dev for dev in data["devices"] if dev["role"] == "IAP" and dev["status"] == status}
+    ap_connections = {edge["toIf"]["serial"]: edge for edge in data["edges"] if edge["toIf"]["serial"] in aps_in_site}
+    data = [
+        {
+            "ap": aps_in_site[ap].get("name", "--"),
+            "ap_ip": aps_in_site[ap].get("ipAddress", "--"),
+            "ap_serial": aps_in_site[ap].get("serial", "--"),
+            "ap_port": ap_connections.get(ap, {"toIf": {}})["toIf"].get("portNumber", "--"),
+            # "ap_untagged_vlan": x["toIf"].get("untaggedVlan"),
+            # "ap_tagged_vlans": x["toIf"].get("taggedVlans"),
+            "switch": ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("deviceName", "--"),
+            "switch_ip": ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("ipAddress", "--") if ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("ipAddress") not in [None, "Unknown"] else cache.devices_by_serial.get(ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("serial", "--"), {}).get("ip", "--"),
+            "switch_serial": ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("serial", "--"),
+            "switch_port": ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("name", "--"),
+            "untagged_vlan": ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("untaggedVlan", "--"),
+            "tagged_vlans": ",".join([str(v) for v in sorted(ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("taggedVlans") or []) if v != ap_connections.get(ap, {"fromIf": {}})["fromIf"].get("untaggedVlan", 9999)]),
+            "healthy": "✅" if aps_in_site[ap].get("health", "") == "good" else "❌"
+        } for ap in aps_in_site
+    ]
+
     return simple_kv_formatter(data)

{centralcli-5.2.1 → centralcli-5.2.2}/centralcli/clishow.py

@@ -461,15 +461,22 @@ def aps(
             print(":x: [bright_red]Error:[/] [cyan]--site <site name>[/] is required for neighbors output.")
             raise typer.Exit(1)
 
-        site = cli.cache.get_site_identifier(site)
-        resp = cli.central.request(cli.central.get_topo_for_site, site.id, )
-        tablefmt = cli.get_format(do_json=do_json, do_yaml=do_yaml, do_csv=do_csv, do_table=do_table, default="rich")
-        cli.display_results(resp, tablefmt=tablefmt, title="AP Neighbors", pager=pager, outfile=outfile, sort_by=sort_by, reverse=reverse, cleaner=cleaner.show_all_ap_lldp_neighbors_for_site)
+        site: CentralObject = cli.cache.get_site_identifier(site)
+        resp: Response = cli.central.request(cli.central.get_topo_for_site, site.id, )
+        tablefmt: str = cli.get_format(do_json=do_json, do_yaml=do_yaml, do_csv=do_csv, do_table=do_table, default="rich")
+
+        cleaner_kwargs = {}
+        if up and down:
+            ...  # They used both flags.  ignore
+        elif up or down:
+            cleaner_kwargs["filter"] = "down" if down else "up"
+        cli.display_results(resp, tablefmt=tablefmt, title=f"AP Neighbors for site {site.name}", pager=pager, outfile=outfile, sort_by=sort_by, reverse=reverse, cleaner=cleaner.show_all_ap_lldp_neighbors_for_sitev2, **cleaner_kwargs)
     else:
-        if down:
-            status = "Down"
-        elif up:
-            status = "Up"
+        if up and down:
+            ...  # They used both flags.  ignore
+        elif up or down:
+            status = "Down" if down else "Up"
+
         show_devices(
             aps, dev_type="aps", verbosity=verbose, outfile=outfile, update_cache=update_cache, group=group, site=site, label=label, status=status,
             state=state, pub_ip=pub_ip, do_clients=True, do_stats=True, do_ssids=True,

{centralcli-5.2.1 → centralcli-5.2.2}/centralcli/cliupdate.py

@@ -200,7 +200,7 @@ def group(
     cx: bool = typer.Option(None, "--cx", help="Allow ArubaOS-CX switches in group."),
     gw: bool = typer.Option(None, "--gw", help=f"Allow gateways in group.\n{' ':34}If No device types specified all are allowed."),
     mo_sw: bool = typer.Option(None, is_flag=True, help="Monitor Only for ArubaOS-SW"),
-    mo_cx: bool = typer.Option(None, help="Monitor Only for ArubaOS-CX", hidden=True),
+    mo_cx: bool = typer.Option(None, help="Monitor Only for ArubaOS-CX"),
     # ap_user: str = typer.Option("admin", help="Provide user for AP group"),  # TODO build func to update group pass
     # ap_passwd: str = typer.Option(None, help="Provide password for AP group (use single quotes)"),
     yes: bool = typer.Option(False, "-Y", help="Bypass confirmation prompts - Assume Yes"),

{centralcli-5.2.1 → centralcli-5.2.2}/pyproject.toml

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