Merge ~ltrager/maas:lp1660418 into maas:master

[Lee Trager]

LP: #1660418 - Delete new versions of user uploaded BootResources by default.

aa4e1ce... by Lee Trager on 2018-09-21

Update comments

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

diff --git a/src/maasserver/forms/__init__.py b/src/maasserver/forms/__init__.py
index 903c510..773d09c 100644
--- a/src/maasserver/forms/__init__.py
+++ b/src/maasserver/forms/__init__.py
@@ -2301,6 +2301,8 @@ class BootResourceForm(MAASModelForm):
     content = forms.FileField(
         label="File", allow_empty_file=False)
 
+    keep_old = forms.BooleanField(required=False)
+
     def __init__(self, *args, **kwargs):
         super(BootResourceForm, self).__init__(*args, **kwargs)
         self.set_up_architecture_field()
@@ -2437,6 +2439,15 @@ class BootResourceForm(MAASModelForm):
         resource_set = self.create_resource_set(resource, 'uploaded')
         self.create_resource_file(
             resource_set, self.cleaned_data)
+
+        # LP:1660418 - Delete new versions of user uploaded BootResources to
+        # avoid duplicated images in the database that are unusable.
+        if not self.cleaned_data['keep_old']:
+            old_brfs = BootResourceFile.objects.filter(
+                resource_set__resource=resource)
+            old_brfs = old_brfs.exclude(resource_set=resource_set)
+            old_brfs.delete()
+
         return resource
 
 
diff --git a/src/maasserver/forms/tests/test_bootresource.py b/src/maasserver/forms/tests/test_bootresource.py
index c716ef4..2b8570c 100644
--- a/src/maasserver/forms/tests/test_bootresource.py
+++ b/src/maasserver/forms/tests/test_bootresource.py
@@ -13,8 +13,14 @@ from maasserver.enum import (
     BOOT_RESOURCE_TYPE,
 )
 from maasserver.forms import BootResourceForm
-from maasserver.models import BootResource
-from maasserver.models.signals import bootsources
+from maasserver.models import (
+    BootResource,
+    BootResourceFile,
+)
+from maasserver.models.signals import (
+    bootresourcefiles,
+    bootsources,
+)
 from maasserver.testing.architecture import make_usable_architecture
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
@@ -31,6 +37,8 @@ class TestBootResourceForm(MAASServerTestCase):
         super().setUp()
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
+        self.addCleanup(bootresourcefiles.signals.enable)
+        bootresourcefiles.signals.disable()
 
     def pick_filetype(self):
         filetypes = {
@@ -193,6 +201,7 @@ class TestBootResourceForm(MAASServerTestCase):
             'name': name,
             'architecture': architecture,
             'filetype': upload_type,
+            'keep_old': True,
             }
         form = BootResourceForm(data=data, files={'content': uploaded_file})
         self.assertTrue(form.is_valid(), form._errors)
@@ -260,6 +269,7 @@ class TestBootResourceForm(MAASServerTestCase):
             'name': name,
             'architecture': architecture,
             'filetype': upload_type,
+            'keep_old': True,
             }
         form = BootResourceForm(data=data, files={'content': uploaded_file})
         self.assertTrue(form.is_valid(), form._errors)
@@ -295,6 +305,7 @@ class TestBootResourceForm(MAASServerTestCase):
             'name': name,
             'architecture': architecture,
             'filetype': upload_type,
+            'keep_old': True,
             }
         form = BootResourceForm(data=data, files={'content': uploaded_file})
         self.assertTrue(form.is_valid(), form._errors)
@@ -317,3 +328,32 @@ class TestBootResourceForm(MAASServerTestCase):
             'name', 'architecture', 'filetype', 'content',
             ],
             form.errors.keys())
+
+    def test_removes_old_bootresourcefiles(self):
+        # Regression test for LP:1660418
+        os = factory.make_name('os')
+        series = factory.make_name('series')
+        OperatingSystemRegistry.register_item(os, CustomOS())
+        self.addCleanup(
+            OperatingSystemRegistry.unregister_item, os)
+        name = '%s/%s' % (os, series)
+        architecture = make_usable_architecture(self)
+        resource = factory.make_usable_boot_resource(
+            rtype=BOOT_RESOURCE_TYPE.UPLOADED,
+            name=name, architecture=architecture)
+        upload_type, filetype = self.pick_filetype()
+        size = random.randint(1024, 2048)
+        content = factory.make_string(size).encode('utf-8')
+        upload_name = factory.make_name('filename')
+        uploaded_file = SimpleUploadedFile(content=content, name=upload_name)
+        data = {
+            'name': name,
+            'architecture': architecture,
+            'filetype': upload_type,
+            }
+        form = BootResourceForm(data=data, files={'content': uploaded_file})
+        self.assertTrue(form.is_valid(), form._errors)
+        form.save()
+        self.assertEqual(
+            1, BootResourceFile.objects.filter(
+                resource_set__resource=resource).count())