Use subnet-list command instead of config

Author: devon-mar

netbox_kea/constants.py

@@ -15,7 +15,7 @@
 CLIENT_ID_MAX_OCTETS = DUID_MAX_OCTETS
 CLIENT_ID_MIN_OCTETS = 2
 
-KEA_BASIC_PASSWORD = "kea"
+KEA_BASIC_PASSWORD = "kea1234"
 KEA_BASIC_URL = "http://nginx"
 KEA_BASIC_USERNAME = "kea"
 KEA_CA = "/certs/ca.crt"

netbox_kea/tables.py

@@ -1,5 +1,6 @@
+from typing import Any
+
 import django_tables2 as tables
-from django.urls import reverse
 from django.utils.http import urlencode
 from netbox.tables import BaseTable, NetBoxTable, ToggleColumn, columns
 
@@ -137,10 +138,7 @@ class SubnetTable(GenericTable):
     subnet = tables.Column(
         linkify=lambda record, table: (
             (
-                reverse(
-                    f"plugins:netbox_kea:server_leases{record['dhcp_version']}",
-                    args=[record["server_pk"]],
-                )
+                table.server_url
                 + "?"
                 + urlencode({"by": "subnet", "q": record["subnet"]})
             )
@@ -156,6 +154,12 @@ class Meta(GenericTable.Meta):
         fields = ("id", "subnet", "shared_network", "actions")
         default_columns = ("id", "subnet", "shared_network")
 
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+
+        # This must be set before rendering.
+        self.server_url: str | None = None
+
 
 class BaseLeaseTable(GenericTable):
     # This column is for the select checkboxes.

netbox_kea/views.py

@@ -501,34 +501,18 @@ def get_subnets(self, server: Server) -> list[dict[str, Any]]:
         client = server.get_client(self.dhcp_version)
         assert client is not None, "TODO"
 
-        config = client.command("config-get")
+        config = client.command(f"subnet{self.dhcp_version}-list")
         assert config[0]["arguments"] is not None
-        subnets = config[0]["arguments"][f"Dhcp{self.dhcp_version}"][
-            f"subnet{self.dhcp_version}"
-        ]
+        subnets = config[0]["arguments"]["subnets"]
         subnet_list = [
             {
                 "id": s["id"],
                 "subnet": s["subnet"],
-                "dhcp_version": self.dhcp_version,
-                "server_pk": server.pk,
+                "shared_network": s["shared-network-name"],
             }
             for s in subnets
-            if "id" in s and "subnet" in s
         ]
 
-        for sn in config[0]["arguments"][f"Dhcp{self.dhcp_version}"]["shared-networks"]:
-            subnet_list.extend(
-                {
-                    "id": s["id"],
-                    "subnet": s["subnet"],
-                    "shared_network": sn["name"],
-                    "dhcp_version": self.dhcp_version,
-                    "server_pk": server.pk,
-                }
-                for s in sn[f"subnet{self.dhcp_version}"]
-            )
-
         return subnet_list
 
     def get(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
@@ -542,6 +526,10 @@ def get(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
 
         table_data = self.prep_table_data(request, child_objects, instance)
         table = self.get_table(table_data, request, False)
+        table.server_url = reverse(
+            f"plugins:netbox_kea:server_leases{self.dhcp_version}",
+            args=[instance.pk],
+        )
 
         if "export" in request.GET:
             return export_table(

tests/docker/kea_configs/kea-dhcp4.conf

@@ -285,7 +285,8 @@
     // hook libraries, see https://gitlab.isc.org/isc-projects/kea/wikis/Hooks-available.
     "hooks-libraries": [
         {"library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"},
-        {"library": "/usr/lib/kea/hooks/libdhcp_stat_cmds.so"}
+        {"library": "/usr/lib/kea/hooks/libdhcp_stat_cmds.so"},
+        {"library": "/usr/lib/kea/hooks/libdhcp_subnet_cmds.so"}
     ],
     //   {
     //       // Forensic Logging library generates forensic type of audit trail

tests/docker/kea_configs/kea-dhcp6.conf

@@ -231,7 +231,8 @@
     // hook libraries, see https://gitlab.isc.org/isc-projects/kea/wikis/Hooks-available.
     "hooks-libraries": [
         {"library": "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"},
-        {"library": "/usr/lib/kea/hooks/libdhcp_stat_cmds.so"}
+        {"library": "/usr/lib/kea/hooks/libdhcp_stat_cmds.so"},
+        {"library": "/usr/lib/kea/hooks/libdhcp_subnet_cmds.so"}
     ],
     //   {
     //       // Forensic Logging library generates forensic type of audit trail