Merge ~ltrager/maas:lp1881919_2.7 into maas:2.7

[Lee Trager]

LP: #1881919 - Allow user to disable running a user uploaded commissioning script.

Currently when no commissioning scripts are selected by the user all user
uploaded commissioning scripts are automatically selected. This branch adds two ways to disable that.

1. Any commissioning script tagged with "noauto" won't be automatically selected by MAAS.
2. When using the API if commissioning_scripts=none no user uploaded commissioning script will be selected.

[Lee Trager (ltrager)]

review: Approve

diff --git a/src/maasserver/forms/ephemeral.py b/src/maasserver/forms/ephemeral.py
index 6ada27a..5e10990 100644
--- a/src/maasserver/forms/ephemeral.py
+++ b/src/maasserver/forms/ephemeral.py
@@ -261,7 +261,7 @@ class CommissionForm(TestForm):
                     self.data[script_field] = value.split(",")
 
         choices = {
-            SCRIPT_TYPE.COMMISSIONING: [],
+            SCRIPT_TYPE.COMMISSIONING: [("none", "none")],
             SCRIPT_TYPE.TESTING: [("none", "none")],
         }
         scripts = Script.objects.all()
diff --git a/src/metadataserver/models/scriptset.py b/src/metadataserver/models/scriptset.py
index c1c0435..d7dca6d 100644
--- a/src/metadataserver/models/scriptset.py
+++ b/src/metadataserver/models/scriptset.py
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = ["ScriptSet", "get_status_from_qs", "translate_result_type"]
@@ -145,9 +145,13 @@ class ScriptSetManager(Manager):
             # all by default excluding for_hardware scripts.
             qs = Script.objects.filter(
                 script_type=SCRIPT_TYPE.COMMISSIONING, for_hardware=[]
-            )
+            ).exclude(tags__contains=["noauto"])
             for script in qs:
                 script_set.add_pending_script(script, script_input)
+        elif "none" in scripts:
+            # Don't add any scripts besides the ones that come with MAAS but
+            # do perform cleanup below.
+            pass
         else:
             self._add_user_selected_scripts(script_set, scripts, script_input)
 
diff --git a/src/metadataserver/models/tests/test_scriptset.py b/src/metadataserver/models/tests/test_scriptset.py
index f69175e..79bd5dd 100644
--- a/src/metadataserver/models/tests/test_scriptset.py
+++ b/src/metadataserver/models/tests/test_scriptset.py
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = []
@@ -181,6 +181,10 @@ class TestScriptSetManager(MAASServerTestCase):
 
     def test_create_commissioning_script_set_adds_all_user_scripts(self):
         script = factory.make_Script(script_type=SCRIPT_TYPE.COMMISSIONING)
+        # Scripts tagged with noauto must be specified by name.
+        factory.make_Script(
+            script_type=SCRIPT_TYPE.COMMISSIONING, tags=["noauto"]
+        )
         node = factory.make_Node()
         expected_scripts = list(NODE_INFO_SCRIPTS)
         expected_scripts.append(script.name)
@@ -196,6 +200,23 @@ class TestScriptSetManager(MAASServerTestCase):
             node.power_state, script_set.power_state_before_transition
         )
 
+    def test_create_commissioning_script_set_adds_no_user_scripts(self):
+        factory.make_Script(script_type=SCRIPT_TYPE.COMMISSIONING)
+        node = factory.make_Node()
+
+        script_set = ScriptSet.objects.create_commissioning_script_set(
+            node, scripts="none"
+        )
+
+        self.assertItemsEqual(
+            list(NODE_INFO_SCRIPTS),
+            [script_result.name for script_result in script_set],
+        )
+        self.assertEquals(RESULT_TYPE.COMMISSIONING, script_set.result_type)
+        self.assertEquals(
+            node.power_state, script_set.power_state_before_transition
+        )
+
     def test_create_commissioning_script_set_adds_for_hardware_matches_tag(
         self,
     ):