Merge ~mpontillo/maas:fix-registration--bug-1705774 into maas:master

[Mike Pontillo]

Fix registration of disabled interfaces.

LP: #1705774

[Lee Trager (ltrager)]

Thanks for fixing this! I've confirmed this fixes the bug I filed(remember to link it).

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b fix-registration--bug-1705774 lp:~mpontillo/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/139/console

[MAAS Lander (maas-lander)]

LANDING
-b fix-registration--bug-1705774 lp:~mpontillo/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/140/console

[MAAS Lander (maas-lander)]

LANDING
-b fix-registration--bug-1705774 lp:~mpontillo/maas into -b master lp:~maas-committers/maas

STATUS: FAILED MERGE
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-lander/23972/console

diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index d27a111..d06ce5b 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -4455,7 +4455,7 @@ class Controller(Node):
             interface.ip_addresses.exclude(
                 alloc_type=IPADDRESS_TYPE.DISCOVERED))
         updated_ip_addresses = set()
-        if use_interface_vlan:
+        if use_interface_vlan and interface.vlan is not None:
             vlan = interface.vlan
         elif len(links) > 0:
             fabric = Fabric.objects.create()
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 88ad200..6f1c034 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -9151,6 +9151,46 @@ class TestUpdateInterfaces(MAASServerTestCase):
                 vlan=br0_vlan,
             ))
 
+    def test_registers_bridge_with_disabled_parent(self):
+        controller = self.create_empty_controller()
+        interfaces = {
+            'eth0': {
+                'enabled': True,
+                'links': [{
+                    'address': '10.0.0.2/24',
+                    'gateway': '10.0.0.1',
+                    'mode': 'static'
+                }],
+                'mac_address': '52:54:00:3a:01:35',
+                'parents': [],
+                'source': 'ipaddr',
+                'type': 'physical'
+            },
+            'virbr0': {
+                'enabled': True,
+                'links': [{
+                    'address': '192.168.122.1/24', 'mode': 'static'
+                }],
+                'mac_address': '52:54:00:3a:01:36',
+                'parents': ['virbr0-nic'],
+                'source': 'ipaddr',
+                'type': 'bridge'
+            },
+            'virbr0-nic': {
+                'enabled': False,
+                'mac_address': '52:54:00:3a:01:36',
+                'links': [],
+                'parents': [],
+                'source': 'ipaddr',
+                'type': 'physical'
+            }
+        }
+        self.update_interfaces(controller, interfaces)
+        subnet = get_one(Subnet.objects.filter(cidr='10.0.0.0/24'))
+        self.assertIsNotNone(subnet)
+        subnet = get_one(Subnet.objects.filter(cidr='192.168.122.0/24'))
+        self.assertIsNotNone(subnet)
+
     def test_registers_bridge_with_no_parents_and_links(self):
         controller = self.create_empty_controller()
         interfaces = {