Merge ~freyes/maas:lp1880495 into maas:2.3

[Felipe Reyes]

I'm proposing this change to get feedback, I understand that I'll need to first propose it against master and then backport it to previous releases.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1880495 lp:~freyes/maas/+git/maas into -b 2.3 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 6c45d678beb67db8a1c5b0e1836e99a45c3dabb8

review: Approve

[Alberto Donato (ack)]

Hi, change looks good.

To remove dependencies on model code, these imports should also br dropped:

import maasserver.models.dnsresource
from maasserver.models.domain import DEFAULT_DOMAIN_NAME
import maasserver.models.node

DEFAULT_DOMAIN_NAME can be just defined locally with the same value, the others are actually unused.

Note that the patch is at a different location in master (src/maasserver/migrations/maasserver/0011_domain_data.py), but other than that the change should apply cleanly.

Thanks!

[Adam Collard (adam-collard)]

review: Needs Fixing

Unmerged commits

6c45d67... by Felipe Reyes on 2020-05-26

LP: #1880495 - Use get_or_create() in migration step

The function get_default_domain() sets the ttl which during the migration
step 0011 is not present in the database yet. This patch uses get_or_create()
instead to get the 'maas' domain object with the same defaults that
get_default_domain() uses.

diff --git a/src/maasserver/migrations/builtin/maasserver/0011_domain_data.py b/src/maasserver/migrations/builtin/maasserver/0011_domain_data.py
index 7e965d6..30a7cba 100644
--- a/src/maasserver/migrations/builtin/maasserver/0011_domain_data.py
+++ b/src/maasserver/migrations/builtin/maasserver/0011_domain_data.py
@@ -106,7 +106,19 @@ def migrate_staticipaddress_hostname(apps, schema_editor):
         if len(domains):
             domain_id = domains.pop().id
         else:
-            domain_id = maasserver.models.dnsresource.get_default_domain()
+            now = datetime.datetime.now()
+            domain, _ = Domain.objects.get_or_create(
+                id=0,
+                defaults={
+                    'id': 0,
+                    'name': DEFAULT_DOMAIN_NAME,
+                    'authoritative': True,
+                    'created': now,
+                    'updated': now,
+                }
+            )
+            domain_id = domain.id
+
         now = datetime.datetime.now()
         dnsrr, _ = DNSResource.objects.get_or_create(
             name=hostname,