Merge ~cgrabowski/maas:fix_counting_ha_vlans_backport_to_3.2 into maas:3.2

[Christian Grabowski]

handle unlinked interfaces when counting HA VLANs
(cherry picked from commit ea45233cce0dc3e9b988d7eead509057ec67ddd7)

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_counting_ha_vlans_backport_to_3.2 lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/277/consoleText
COMMIT: 3bd75e4cdf0fceb599c755cf9c71eadacef29695

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_counting_ha_vlans_backport_to_3.2 lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/279/consoleText
COMMIT: 203dc591eeeb1bae523f6e23af43953e78365fd7

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_counting_ha_vlans_backport_to_3.2 lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: a8ad07fd216926185c55d1e89db3a355b856c8b7

review: Approve

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b fix_counting_ha_vlans_backport_to_3.2 lp:~cgrabowski/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/282/consoleText

diff --git a/src/maasserver/websockets/handlers/controller.py b/src/maasserver/websockets/handlers/controller.py
index 7365b5b..89e5116 100644
--- a/src/maasserver/websockets/handlers/controller.py
+++ b/src/maasserver/websockets/handlers/controller.py
@@ -175,6 +175,7 @@ class ControllerHandler(NodeHandler):
         vlan_ids = [
             interface.vlan_id
             for interface in obj.current_config.interface_set.all()
+            if interface.vlan_id is not None
         ]
         for vlan_id in vlan_ids:
             vlan_counts[self._vlans_ha[vlan_id]] += 1
diff --git a/src/maasserver/websockets/handlers/tests/test_controller.py b/src/maasserver/websockets/handlers/tests/test_controller.py
index eda0b66..ec1ccd9 100644
--- a/src/maasserver/websockets/handlers/tests/test_controller.py
+++ b/src/maasserver/websockets/handlers/tests/test_controller.py
@@ -496,3 +496,19 @@ class TestControllerHandler(MAASServerTestCase):
         handler.update_interface(request)
         controller.refresh_from_db()
         self.assertEqual(controller.boot_interface.vlan, vlan)
+
+    def test_count_HA_vlans_with_unlinked_interfaces(self):
+        admin = factory.make_admin()
+        handler = ControllerHandler(admin, {}, None)
+        primary = factory.make_RegionRackController()
+        primary.current_config.interface_set.add(
+            factory.make_Interface(link_connected=False)
+        )
+        secondary = factory.make_RackController()
+        factory.make_VLAN(primary_rack=primary, secondary_rack=secondary)
+        factory.make_VLAN(primary_rack=primary)
+        output = handler.get({"system_id": primary.system_id})
+        self.assertEqual(output["vlans_ha"]["true"], 1)
+        self.assertEqual(
+            output["vlans_ha"]["false"], 2
+        )  # default interface and the one linked to vlan2