sts-sponsors team mailing list archive

[Alberto Donato <mp+442579@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:interface-params-cleanups into maas:master.

Commit message:
drop unused Interface ipv4_params and ipv6_params fields, set empty dict default for params



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/442579
-- 
Your team MAAS Committers is subscribed to branch maas:master.

diff --git a/src/maasserver/migrations/maasserver/0303_interface_params_cleanups.py b/src/maasserver/migrations/maasserver/0303_interface_params_cleanups.py
new file mode 100644
index 0000000..67f10e0
--- /dev/null
+++ b/src/maasserver/migrations/maasserver/0303_interface_params_cleanups.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.2.12 on 2023-05-10 07:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("maasserver", "0302_big_auto_field"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="interface",
+            name="ipv4_params",
+        ),
+        migrations.RemoveField(
+            model_name="interface",
+            name="ipv6_params",
+        ),
+        migrations.RunSQL(
+            """
+            UPDATE maasserver_interface
+            SET params = '{}'::jsonb
+            WHERE params = '""'::jsonb
+            """
+        ),
+    ]
diff --git a/src/maasserver/models/interface.py b/src/maasserver/models/interface.py
index a2c83ef..3d33de0 100644
--- a/src/maasserver/models/interface.py
+++ b/src/maasserver/models/interface.py
@@ -577,10 +577,6 @@ class Interface(CleanSave, TimestampedModel):
 
     mac_address = TextField(null=True, blank=True, validators=[MAC_VALIDATOR])
 
-    ipv4_params = JSONField(blank=True, default=dict)
-
-    ipv6_params = JSONField(blank=True, default=dict)
-
     params = JSONField(blank=True, default=dict)
 
     tags = ArrayField(TextField(), blank=True, null=True, default=list)
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 2e5c84a..4fdaf59 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -4955,8 +4955,6 @@ class Node(CleanSave, TimestampedModel):
         for self_interface, source_interface in mapping.items():
             self_interface.vlan = source_interface.vlan
             self_interface.params = source_interface.params
-            self_interface.ipv4_params = source_interface.ipv4_params
-            self_interface.ipv6_params = source_interface.ipv6_params
             self_interface.enabled = source_interface.enabled
             self_interface.acquired = source_interface.acquired
             self_interface.save()