Merge lp:~blake-rouse/maas/fix-1508072-and-1508076 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix precache on subnet handler. Fix handling partition table being deleted before partitions.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/fix-1508072-and-1508076 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 [97.6 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [240 kB]
Get:5 http://security.ubuntu.com trusty-security/universe Sources [31.0 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [355 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [140 kB]
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [117 kB]
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [634 kB]
Get:10 http://security.ubuntu.com trusty-security/main Translation-en [193 kB]
Get:11 http://security.ubuntu.com trusty-security/universe Translation-en [68.3 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [323 kB]
Get:13 http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en [307 kB]
Get:14 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [170 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,805 kB in 4s (629 kB/s)

E: dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to correct the problem.

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/fix-1508072-and-1508076 into lp:maas failed. Below is the output from the failed tests.

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
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
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-testscenarios python-testtools python-twisted python-txtftp python-tz python-unittest2 python-virtualenv python-yaml python-zope.interface socat syslinux-common...

=== modified file 'src/maasserver/models/partition.py'
--- src/maasserver/models/partition.py	2015-10-15 19:36:22 +0000
+++ src/maasserver/models/partition.py	2015-10-20 15:04:48 +0000
@@ -300,7 +300,14 @@
 def delete_partition_table(sender, instance, **kwargs):
     """Delete the partition table if this is the last partition on the
     partition table."""
+    # Circular imports.
+    from maasserver.models.partitiontable import PartitionTable
     if sender == Partition:
-        partition_table = instance.partition_table
-        if partition_table.partitions.count() == 0:
-            partition_table.delete()
+        try:
+            partition_table = instance.partition_table
+        except PartitionTable.DoesNotExist:
+            # Partition table has already been removed nothing to do.
+            return
+        else:
+            if partition_table.partitions.count() == 0:
+                partition_table.delete()

=== modified file 'src/maasserver/models/tests/test_partition.py'
--- src/maasserver/models/tests/test_partition.py	2015-10-16 13:34:30 +0000
+++ src/maasserver/models/tests/test_partition.py	2015-10-20 15:04:48 +0000
@@ -356,3 +356,9 @@
         self.assertIsNotNone(reload_object(partition1))
         self.assertIsNotNone(reload_object(partition_table))
         self.assertIsNone(reload_object(partition2))
+
+    def test_delete_partitiontable_before_partition_doesnt_raise_error(self):
+        partition_table = factory.make_PartitionTable()
+        factory.make_Partition(partition_table=partition_table)
+        # Test is that no error is raised.
+        partition_table.delete()

=== modified file 'src/maasserver/websockets/handlers/subnet.py'
--- src/maasserver/websockets/handlers/subnet.py	2015-10-02 19:19:15 +0000
+++ src/maasserver/websockets/handlers/subnet.py	2015-10-20 15:04:48 +0000
@@ -34,7 +34,7 @@
                   .prefetch_related('nodegroupinterface_set__nodegroup')
                   .prefetch_related('staticipaddress_set__user')
                   .prefetch_related(
-                      'staticipaddress_set__user__interface_set__node'))
+                      'staticipaddress_set__interface_set__node'))
         pk = 'id'
         allowed_methods = ['list', 'get', 'set_active']
         listen_channels = [