Merge pull request #2402 from johannaengland/seeddb-vlan

Optimize SeedDB vlan listing queries
Uninett · May 4, 2022 · cbaaa19 · cbaaa19
2 parents a866c20 + 28a6af9
commit cbaaa19
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/python/nav/web/seeddb/page/vlan.py b/python/nav/web/seeddb/page/vlan.py
@@ -80,15 +80,19 @@ class Meta(object):
 
 def vlan_list(request):
     info = VlanInfo()
-    query = Vlan.objects.extra(
-        select={
-            'prefixes': (
-                "array_to_string("
-                "ARRAY(SELECT netaddr FROM prefix "
-                "WHERE vlanid=vlan.vlanid), ', ')"
-            )
-        }
-    ).all()
+    query = (
+        Vlan.objects.extra(
+            select={
+                'prefixes': (
+                    "array_to_string("
+                    "ARRAY(SELECT netaddr FROM prefix "
+                    "WHERE vlanid=vlan.vlanid), ', ')"
+                )
+            }
+        )
+        .select_related("net_type", "organization", "usage")
+        .all()
+    )
     filter_form = VlanFilterForm(request.GET)
     value_list = (
         'net_type',