fix(cli): the trunk gets its own row, as over REST

Since f35b59e a CLI poll reports trunk members as `3` with
trunk_group `Trk3`, but `show interfaces brief` has no line for Trk3
itself, so the trunk was missing from the interface list. The REST path
built that row on its own.

Both paths now use napalm_device_types.add_lag_interfaces, and the REST
path's copy is gone. One visible change there: `lag_members` is now in
port order (7, 10) instead of API order; the description already was.

The CLI path does not know the mode yet, so its trunks carry no
lag_mode. That needs `show trunks`, whose output is not at hand.

Needs napalm-device-types f3fa75b.

Closes #5

napalm_procurve/api_client.py

@@ -15,6 +15,7 @@ import urllib3
 
 from napalm.base import helpers as napalm_helpers
 from napalm.base.exceptions import ConnectionException, ConnectAuthError
+from napalm_device_types import add_lag_interfaces
 
 logger = logging.getLogger("napalm_procurve.api")
 
@@ -307,22 +308,11 @@ class ProcurveApiClient:
             if pid in output:
                 output[pid]["speed"] = float(stat.get("port_speed_mbps", 0))
 
-        # Synthesize a logical interface entry for each configured LAG/trunk
-        # group so it shows up as its own row alongside its member ports.
-        for group, members in trunk_groups.items():
-            output[group] = {
-                "is_up": any(output[m]["is_up"] for m in members),
-                "is_enabled": any(output[m]["is_enabled"] for m in members),
-                "description": f"LAG ({', '.join(sorted(members, key=lambda s: int(s) if s.isdigit() else 0))})",
-                "last_flapped": -1.0,
-                "speed": sum(output[m]["speed"] for m in members),
-                "mtu": -1,
-                "mac_address": "",
-                "lag_members": members,
-                "lag_mode": "lacp" if trunk_modes.get(group) == "PTT_LACP" else "trunk",
-            }
-
-        return output
+        # One row per LAG/trunk group alongside its member ports.
+        return add_lag_interfaces(output, {
+            group: "lacp" if trunk_modes.get(group) == "PTT_LACP" else "trunk"
+            for group in trunk_groups
+        })
 
     def get_interfaces_ip(self) -> Dict[str, Dict]:
         """Return NAPALM interfaces IP from the REST API."""

napalm_procurve/procurve.py

@@ -27,7 +27,12 @@ from netmiko.exceptions import (
     NetmikoAuthenticationException,
     NetmikoTimeoutException,
 )
-from napalm_device_types import ConfigLifecycleMixin, FingerprintRule, SwitchDriver
+from napalm_device_types import (
+    ConfigLifecycleMixin,
+    FingerprintRule,
+    SwitchDriver,
+    add_lag_interfaces,
+)
 from napalm_device_types.models import InterfaceConfigDict, VlanConfigDict
 from napalm.base import helpers as napalm_helpers
 from napalm.base.exceptions import (
@@ -502,7 +507,8 @@ class ProcurveDriver(ConfigLifecycleMixin, SwitchDriver):
             except Exception:
                 pass
 
-        return ifaces
+        # The CLI lists member ports only ("3-Trk3"); the trunk gets its own row.
+        return add_lag_interfaces(ifaces)
 
     # ------------------------------------------------------------------
     # NAPALM: get_interfaces_ip