Merge lp:~mpontillo/maas/fix-0146-populate-subnets-bug-1519247-trunk into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix migration to not require a Subnet when migrating each NodeGroupInterface, if the subnet_mask is not present.

[Mike Pontillo (mpontillo)]

Note: there are no accompanying unit tests since this is a migration. I tested this manually by upgrading from 1.8.3 to a patched 1.9 rc2.

[Andres Rodriguez (andreserl)]

Can you explain a by more why is this ? Also, please have Blake review
this. I have tested this before and the upgrade went fine without any
issues.

Also, why didn't you block rc2 ?

On Tuesday, November 24, 2015, Mike Pontillo <email address hidden>
wrote:

> Note: there are no accompanying unit tests since this is a migration. I
> tested this manually by upgrading from 1.8.3 to a patched 1.9 rc2.
> --
>
> https://code.launchpad.net/~mpontillo/maas/fix-0146-populate-subnets-bug-1519247-trunk/+merge/278413
> You are subscribed to branch lp:maas.
>

--
Andres Rodriguez (RoAkSoAx)
Ubuntu Server Developer
MSc. Telecom & Networking
Systems Engineer

[Mike Pontillo (mpontillo)]

>
> Can you explain a by more why is this ? Also, please have Blake review
> this. I have tested this before and the upgrade went fine without any
> issues.
>

This occurs whenever you try to migrate a cluster interface that has no
subnet_mask. Such a configuration is valid if you are managing nodes
without DHCP or DNS.

80%+ of people will not see this because they'll either fill in a subnet
mask, or the MAAS cluster will do it for them when it discovers their
interfaces.

> Also, why didn't you block rc2?
>

I don't understand the question. You sent out the RC2 announcement minutes
before commenting on this MP (which I filed 8 hours ago?). You could have
waited and asked me? (it's your call in the end, but I figured we were
doing RC3 anyway for the issue we hit yesterday, and this came out of
triaging that. )

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/maasserver/models/migrations/populate_subnets_helper.py'
--- src/maasserver/models/migrations/populate_subnets_helper.py	2015-07-29 05:51:09 +0000
+++ src/maasserver/models/migrations/populate_subnets_helper.py	2015-11-24 09:07:12 +0000
@@ -122,19 +122,22 @@
 def _create_subnet_from_nodegroupinterface(now, ngi, Subnet, default_space,
                                            default_vlan):
     cidr = _get_cidr_for_nodegroupinterface(ngi)
-    try:
-        subnet = Subnet.objects.get(cidr=cidr)
-    except Subnet.DoesNotExist:
-        subnet = Subnet()
-        subnet.name = cidr
-        # VLAN might have been populated by the migration from Network.
-        subnet.vlan = default_vlan
-        subnet.created = now
-    subnet.cidr = cidr
-    subnet.space = default_space
-    subnet.updated = now
-    subnet.gateway_ip = ngi.router_ip
-    subnet.save()
+    if cidr is not None:
+        try:
+            subnet = Subnet.objects.get(cidr=cidr)
+        except Subnet.DoesNotExist:
+            subnet = Subnet()
+            subnet.name = cidr
+            # VLAN might have been populated by the migration from Network.
+            subnet.vlan = default_vlan
+            subnet.created = now
+        subnet.cidr = cidr
+        subnet.space = default_space
+        subnet.updated = now
+        subnet.gateway_ip = ngi.router_ip
+        subnet.save()
+    else:
+        subnet = None
     ngi.subnet = subnet
     ngi.updated = now
     ngi.save()