1
=== modified file 'src/maasserver/models/partition.py'
2
--- src/maasserver/models/partition.py	2015-10-15 19:36:22 +0000
3
+++ src/maasserver/models/partition.py	2015-10-20 15:04:48 +0000
4
@@ -300,7 +300,14 @@
5
300
def delete_partition_table(sender, instance, **kwargs):
300
def delete_partition_table(sender, instance, **kwargs):
6
301
    """Delete the partition table if this is the last partition on the
301
    """Delete the partition table if this is the last partition on the
7
302
    partition table."""
302
    partition table."""
8
303
    # Circular imports.
9
304
    from maasserver.models.partitiontable import PartitionTable
10
303
    if sender == Partition:
305
    if sender == Partition:
14
304
        partition_table = instance.partition_table
306
        try:
15
305
        if partition_table.partitions.count() == 0:
307
            partition_table = instance.partition_table
16
306
            partition_table.delete()
308
        except PartitionTable.DoesNotExist:
17
309
            # Partition table has already been removed nothing to do.
18
310
            return
19
311
        else:
20
312
            if partition_table.partitions.count() == 0:
21
313
                partition_table.delete()
22
307
314
23
=== modified file 'src/maasserver/models/tests/test_partition.py'
24
--- src/maasserver/models/tests/test_partition.py	2015-10-16 13:34:30 +0000
25
+++ src/maasserver/models/tests/test_partition.py	2015-10-20 15:04:48 +0000
26
@@ -356,3 +356,9 @@
27
356
        self.assertIsNotNone(reload_object(partition1))
356
        self.assertIsNotNone(reload_object(partition1))
28
357
        self.assertIsNotNone(reload_object(partition_table))
357
        self.assertIsNotNone(reload_object(partition_table))
29
358
        self.assertIsNone(reload_object(partition2))
358
        self.assertIsNone(reload_object(partition2))
30
359
31
360
    def test_delete_partitiontable_before_partition_doesnt_raise_error(self):
32
361
        partition_table = factory.make_PartitionTable()
33
362
        factory.make_Partition(partition_table=partition_table)
34
363
        # Test is that no error is raised.
35
364
        partition_table.delete()
36
359
365
37
=== modified file 'src/maasserver/websockets/handlers/subnet.py'
38
--- src/maasserver/websockets/handlers/subnet.py	2015-10-02 19:19:15 +0000
39
+++ src/maasserver/websockets/handlers/subnet.py	2015-10-20 15:04:48 +0000
40
@@ -34,7 +34,7 @@
41
34
                  .prefetch_related('nodegroupinterface_set__nodegroup')
34
                  .prefetch_related('nodegroupinterface_set__nodegroup')
42
35
                  .prefetch_related('staticipaddress_set__user')
35
                  .prefetch_related('staticipaddress_set__user')
43
36
                  .prefetch_related(
36
                  .prefetch_related(
45
37
                      'staticipaddress_set__user__interface_set__node'))
37
                      'staticipaddress_set__interface_set__node'))
46
38
        pk = 'id'
38
        pk = 'id'
47
39
        allowed_methods = ['list', 'get', 'set_active']
39
        allowed_methods = ['list', 'get', 'set_active']
48
40
        listen_channels = [
40
        listen_channels = [
Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)		2015-10-20	Approve on 2015-10-20
Review via email: mp+275050@code.launchpad.net