Merge lp:~mpontillo/maas/bug-1514486 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

If no discovered subnets are found when claiming a static IP address, fall back to the subnet on the attached cluster interface.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~mpontillo/maas/bug-1514486 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:3 http://security.ubuntu.com trusty-security/main Sources [99.2 kB]
Get:4 http://security.ubuntu.com trusty-security/universe Sources [31.5 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [244 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [370 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [143 kB]
Get:8 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [652 kB]
Get:9 http://security.ubuntu.com trusty-security/universe amd64 Packages [119 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [326 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en [319 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [172 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 2,604 kB in 4s (601 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-t...

[Mike Pontillo (mpontillo)]

Test failure looks unrelated: http://paste.ubuntu.com/13222946/

I'm going to try landing this again.

=== modified file 'src/maasserver/models/interface.py'
--- src/maasserver/models/interface.py	2015-11-10 17:50:31 +0000
+++ src/maasserver/models/interface.py	2015-11-11 01:11:20 +0000
@@ -1224,15 +1224,14 @@
         if len(existing_statics) > 0:
             return existing_statics
 
+        parent = self._get_parent_node()
         # Get the last subnets this interface DHCP'd from. This with be either
         # one IPv4, one IPv6, or both IPv4 and IPv6.
-        if (self.node is not None and
-                not self.node.installable and
-                self.node.parent is not None):
+        if parent is not None:
             # If this interface is on a device then we need to look for
             # discovered addresses on all the Node's interfaces.
             discovered_ips = StaticIPAddress.objects.none()
-            for interface in self.node.parent.interface_set.all():
+            for interface in parent.interface_set.all():
                 ip_addresses = interface.ip_addresses.filter(
                     alloc_type=IPADDRESS_TYPE.DISCOVERED)
                 ip_addresses = ip_addresses.order_by(
@@ -1244,17 +1243,30 @@
             discovered_ips = discovered_ips.order_by(
                 'id').select_related("subnet")
 
+        discovered_subnets = [
+            discovered_ip.subnet for discovered_ip in discovered_ips
+        ]
+
+        if len(discovered_subnets) == 0:
+            # Backward compatibility code. When databases are migrated from 1.8
+            # and earlier, we may not have DISCOVERED addresses yet. So
+            # try to find a subnet on an attached cluster interface.
+            # (Note that get_cluster_interface() handles getting the parent
+            # node, if needed.)
+            for ngi in self.get_cluster_interfaces():
+                if ngi is not None and ngi.subnet is not None:
+                    discovered_subnets.append(ngi.subnet)
+
         if requested_address is None:
             # No requested address so claim a STATIC IP on all DISCOVERED
             # subnets for this interface.
             static_ips = []
-            for discovered_ip in discovered_ips:
-                subnet = discovered_ip.subnet
-                ngi = subnet.get_managed_cluster_interface()
+            for discovered_subnet in discovered_subnets:
+                ngi = discovered_subnet.get_managed_cluster_interface()
                 if ngi is not None:
                     static_ips.append(
                         self.link_subnet(
-                            INTERFACE_LINK_TYPE.STATIC, subnet))
+                            INTERFACE_LINK_TYPE.STATIC, discovered_subnet))
 
             # No valid subnets could be used to claim a STATIC IP address.
             if not any(static_ips):
@@ -1267,10 +1279,10 @@
         else:
             # Find the DISCOVERED subnet that the requested_address falls into.
             found_subnet = None
-            for discovered_ip in discovered_ips:
+            for discovered_subnet in discovered_subnets:
                 if (IPAddress(requested_address) in
-                        discovered_ip.subnet.get_ipnetwork()):
-                    found_subnet = discovered_ip.subnet
+                        discovered_subnet.get_ipnetwork()):
+                    found_subnet = discovered_subnet
                     break
 
             if found_subnet:
@@ -1284,6 +1296,17 @@
                     "requested_address '%s' is not in a managed subnet for "
                     "this interface '%s'" % (requested_address, self.name))
 
+    def _get_parent_node(self):
+        """Return the parent node for this interface, if it exists (and this
+        interface belongs to a Device). Otherwise, return None.
+        """
+        if (self.node is not None and
+                not self.node.installable and
+                self.node.parent is not None):
+            return self.node.parent
+        else:
+            return None
+
     def delete(self, remove_ip_address=True):
         # We set the _skip_ip_address_removal so the signal can use it to
         # skip removing the IP addresses. This is normally only done by the

=== modified file 'src/maasserver/models/tests/test_interface.py'
--- src/maasserver/models/tests/test_interface.py	2015-11-10 17:50:31 +0000
+++ src/maasserver/models/tests/test_interface.py	2015-11-11 01:11:20 +0000
@@ -26,6 +26,7 @@
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
     NODE_PERMISSION,
+    NODE_STATUS,
     NODEGROUP_STATUS,
     NODEGROUPINTERFACE_MANAGEMENT,
 )
@@ -75,6 +76,7 @@
 from testtools import ExpectedException
 from testtools.matchers import (
     Equals,
+    HasLength,
     MatchesDict,
     MatchesListwise,
     MatchesStructure,
@@ -2594,3 +2596,17 @@
                 INTERFACE_LINK_TYPE.STATIC, subnet_v4,
                 ip_address=requested_ip))
         self.assertEquals(sentinel.claimed_ip, claimed_ip)
+
+    def test__finds_device_subnet_via_parent_cluster_interface(self):
+        node = factory.make_Node_with_Interface_on_Subnet(
+            status=NODE_STATUS.DEPLOYED)
+        # Create a situation that looks like a migration from MAAS 1.8
+        # (no DISCOVERED IP addresses on this node, because it hasn't
+        # recommissioned.)
+        node.get_boot_interface().ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.DISCOVERED).delete()
+        device = factory.make_Device(parent=node)
+        iface = factory.make_Interface(node=device)
+        self.patch_autospec(iface, "link_subnet")
+        claimed_ips = iface.claim_static_ips()
+        self.assertThat(claimed_ips, HasLength(1))