sts-sponsors team mailing list archive

[Eline Maaike De Weerd <mp+440928@xxxxxxxxxxxxxxxxxx>]

Eline Maaike De Weerd has proposed merging ~emdw/maas:backport-fix-1959648-to-3.3 into maas:3.3.

Commit message:
included subnet ids with vlan returns
(please check if it's doing the right thing, was unsure about bug description)
(cherry picked from commit 7e48dfa48c83eddfed5f24e29bdb365881dc1024)



Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1959648 in MAAS: "Websocket vlan handler should include associated subnet ids"
  https://bugs.launchpad.net/maas/+bug/1959648

For more details, see:
https://code.launchpad.net/~emdw/maas/+git/maas/+merge/440928
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~emdw/maas:backport-fix-1959648-to-3.3 into maas:3.3.

diff --git a/src/maasserver/websockets/handlers/tests/test_vlan.py b/src/maasserver/websockets/handlers/tests/test_vlan.py
index 36e49f6..0449073 100644
--- a/src/maasserver/websockets/handlers/tests/test_vlan.py
+++ b/src/maasserver/websockets/handlers/tests/test_vlan.py
@@ -48,6 +48,9 @@ class TestVLANHandler(MAASServerTestCase):
                 }
             )
         )
+        data["subnet_ids"] = list(
+            vlan.subnet_set.values_list("id", flat=True).order_by("id")
+        )
         if not for_list:
             data["node_ids"] = sorted(
                 list(
diff --git a/src/maasserver/websockets/handlers/vlan.py b/src/maasserver/websockets/handlers/vlan.py
index c642143..fb68502 100644
--- a/src/maasserver/websockets/handlers/vlan.py
+++ b/src/maasserver/websockets/handlers/vlan.py
@@ -67,6 +67,9 @@ class VLANHandler(TimestampedModelHandler):
         data["rack_sids"] = sorted(
             node.system_id for node in nodes if node.is_rack_controller
         )
+        data["subnet_ids"] = list(
+            obj.subnet_set.values_list("id", flat=True).order_by("id")
+        )
         if not for_list:
             data["node_ids"] = sorted(node.id for node in nodes)
             data["space_ids"] = sorted(