Merge ~cgrabowski/maas:use_fqdn_with_subnet_resource_name_in_preseed into maas:master

[Christian Grabowski]

include maas-internal to make fqdn

[Alexsander de Souza (alexsander-souza)]

We should get the domain from the Config `maas_internal_domain`

review: Needs Fixing

[Christian Grabowski (cgrabowski)]

> We should get the domain from the Config `maas_internal_domain`
+1

953f026... by Christian Grabowski on 2022-05-24

fetch internal domain from config

[Alexsander de Souza (alexsander-souza)]

LGTM

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b use_fqdn_with_subnet_resource_name_in_preseed lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 8170aa6e0f4bb6ec613c6358367d7aefdcee7c10

review: Approve

diff --git a/src/maasserver/compose_preseed.py b/src/maasserver/compose_preseed.py
index 0a8c07e..c814a01 100644
--- a/src/maasserver/compose_preseed.py
+++ b/src/maasserver/compose_preseed.py
@@ -39,7 +39,8 @@ def _get_anon_rack_host(request, rack_controller):
         client_ip = forwarded_for.split(",")[0]
         subnet = Subnet.objects.get_best_subnet_for_ip(client_ip)
         if subnet:
-            return get_resource_name_for_subnet(subnet)
+            internal_domain = Config.objects.get_config("maas_internal_domain")
+            return f"{get_resource_name_for_subnet(subnet)}.{internal_domain}"
     return rack_controller.fqdn if rack_controller else ""
 
 
diff --git a/src/maasserver/tests/test_compose_preseed.py b/src/maasserver/tests/test_compose_preseed.py
index bb5d9dc..c5a65c1 100644
--- a/src/maasserver/tests/test_compose_preseed.py
+++ b/src/maasserver/tests/test_compose_preseed.py
@@ -1277,9 +1277,10 @@ class TestBuildMetadataURL(MAASServerTestCase):
         original_ip = subnet.get_next_ip_for_allocation()
         request.META["HTTP_X_FORWARDED_FOR"] = str(original_ip)
         route = "/MAAS"
+        Config.objects.set_config("maas_internal_domain", factory.make_name())
         # not passing node to simulate anonymous request, i.e enlistment
         self.assertEqual(
-            f"{request.scheme}://{get_resource_name_for_subnet(subnet)}:5248/MAAS",
+            f"{request.scheme}://{get_resource_name_for_subnet(subnet)}.{Config.objects.get_config('maas_internal_domain')}:5248/MAAS",
             build_metadata_url(
                 request, route, node.get_boot_rack_controller()
             ),