Merge ~ltrager/maas:preserve_other_param_value_on_regeneration into maas:master

[Lee Trager]

On regeneration preserve only the value of non interface or storage parameters.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b preserve_other_param_value_on_regeneration lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 2fb21f536a0085278f1ce1c385f04b04583e26be

review: Approve

[Blake Rouse (blake-rouse)]

review: Approve

4ed6a84... by Lee Trager on 2019-08-14

Add comment

[MAAS Lander (maas-lander)]

UNIT TESTS
-b preserve_other_param_value_on_regeneration lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 4ed6a846bfcd040a62348f3ee0b741f54aaa5f9b

review: Approve

0533dd2... by Lee Trager on 2019-08-14

Drive by fix

diff --git a/src/maasserver/forms/ephemeral.py b/src/maasserver/forms/ephemeral.py
index 17aaae5..dc1ffce 100644
--- a/src/maasserver/forms/ephemeral.py
+++ b/src/maasserver/forms/ephemeral.py
@@ -163,14 +163,14 @@ class TestForm(Form):
     def _get_script_param_dict(self, scripts):
         params = {}
         script_names = []
-        script_ids = []
+        ids = []
         for script in scripts:
             if script.isdigit():
-                script_ids.append(int(script))
+                ids.append(int(script))
             else:
                 script_names.append(script)
         qs = Script.objects.filter(
-            Q(id__in=script_ids) | Q(name__in=script_names))
+            Q(name__in=scripts) | Q(tags__overlap=scripts) | Q(id__in=ids))
         for name, value in self.cleaned_data.items():
             if name in [
                     "enable_ssh", "testing_scripts", "commissioning_scripts",
diff --git a/src/metadataserver/models/scriptset.py b/src/metadataserver/models/scriptset.py
index 32df7ba..ced57d2 100644
--- a/src/metadataserver/models/scriptset.py
+++ b/src/metadataserver/models/scriptset.py
@@ -532,8 +532,12 @@ class ScriptSet(CleanSave, Model):
                     # device or interface may no longer exist. The
                     # ParametersForm will set the default value(all).
                     script_result.parameters.pop(param_name)
-                    regenerate_scripts[
-                        script_result.script] = script_result.parameters
+                    # Only preserve the value of the parameter as that is what
+                    # the form will validate.
+                    regenerate_scripts[script_result.script] = {
+                        key: value['value']
+                        for key, value in script_result.parameters.items()
+                    }
                     script_result.delete()
                     break
 
diff --git a/src/metadataserver/models/tests/test_scriptset.py b/src/metadataserver/models/tests/test_scriptset.py
index a622a22..873a1ac 100644
--- a/src/metadataserver/models/tests/test_scriptset.py
+++ b/src/metadataserver/models/tests/test_scriptset.py
@@ -1199,6 +1199,67 @@ class TestScriptSet(MAASServerTestCase):
             'value': 'all',
             }}, new_storage_script_result.parameters)
 
+    def test_regenerate_network_with_url_param(self):
+        node = factory.make_Node()
+        interface = factory.make_Interface(node=node)
+        interface.ip_addresses.all().delete()
+        interface.ip_addresses.add(factory.make_StaticIPAddress())
+        url = factory.make_url(scheme='http')
+        default_url = factory.make_url(scheme='http')
+        script_set = factory.make_ScriptSet(node=node)
+
+        pending_network_script = factory.make_Script(parameters={
+            'interface': {
+                'type': 'interface',
+            },
+            'url': {
+                'type': 'url',
+                'required': True,
+                'default': default_url,
+            },
+        })
+        factory.make_ScriptResult(
+            script_set=script_set, status=SCRIPT_STATUS.PENDING,
+            script=pending_network_script, parameters={
+                'interface': {
+                    'type': 'interface',
+                    'value': {
+                        'name': factory.make_name('name'),
+                        'mac_address': factory.make_mac_address(),
+                        'vendor': factory.make_name('vendor'),
+                        'product': factory.make_name('product'),
+                    },
+                },
+                'url': {
+                    'type': 'url',
+                    'required': True,
+                    'default': default_url,
+                    'value': url,
+                },
+            })
+
+        script_set.regenerate(storage=False, network=True)
+
+        new_network_script_result = script_set.scriptresult_set.get(
+            script=pending_network_script)
+        self.assertDictEqual({
+            'interface': {
+                'type': 'interface',
+                'value': {
+                    'name': interface.name,
+                    'mac_address': str(interface.mac_address),
+                    'vendor': interface.vendor,
+                    'product': interface.product,
+                    'interface_id': interface.id,
+                },
+            },
+            'url': {
+                'type': 'url',
+                'required': True,
+                'default': default_url,
+                'value': url,
+            }}, new_network_script_result.parameters)
+
     def test_regenerate_logs_failure(self):
         mock_logger = self.patch(scriptset_module.logger, 'error')
         node = factory.make_Node()