Merge ~alexsander-souza/maas:fix_v6_lookup into maas:master

[Alexsander de Souza]

fix: parse DNS results correctly

[Christian Grabowski (cgrabowski)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_v6_lookup lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/5487/console
COMMIT: c7a32e30ce8349cdfc91dd2b9f1c39d364c5330f

review: Needs Fixing

6979d07... by Alexsander de Souza on 2024-05-09

fix mock

[MAAS Lander (maas-lander)]

UNIT TESTS
-b fix_v6_lookup lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 6979d07826a00750f9e1c7dd722696afa81438a5

review: Approve

diff --git a/src/provisioningserver/utils/network.py b/src/provisioningserver/utils/network.py
index 1ea4ec0..6124f68 100644
--- a/src/provisioningserver/utils/network.py
+++ b/src/provisioningserver/utils/network.py
@@ -29,6 +29,7 @@ import netifaces
 from twisted.internet.defer import Deferred, inlineCallbacks
 from twisted.internet.interfaces import IResolver
 from twisted.names.client import getResolver
+from twisted.names.dns import AAAA
 from twisted.names.error import (
     AuthoritativeDomainError,
     DNSQueryTimeoutError,
@@ -772,8 +773,15 @@ def safe_getaddrinfo(
         resolver = getResolver()
         answers = yield resolver.lookupIPV6Address(hostname)
         return [
-            (AF_INET6, sock_type, proto, "", (ans._address, port, 0, 0))
+            (
+                AF_INET6,
+                sock_type,
+                proto,
+                "",
+                (ans.payload._address, port, 0, 0),
+            )
             for ans in answers[0]
+            if ans.type == AAAA
         ]
 
     try:
diff --git a/src/provisioningserver/utils/tests/test_network.py b/src/provisioningserver/utils/tests/test_network.py
index 5f62643..a01a4c8 100644
--- a/src/provisioningserver/utils/tests/test_network.py
+++ b/src/provisioningserver/utils/tests/test_network.py
@@ -13,7 +13,7 @@ from netaddr import EUI, IPAddress, IPNetwork, IPRange
 import netifaces
 from netifaces import AF_INET, AF_INET6, AF_LINK
 from twisted.internet.defer import inlineCallbacks, succeed
-from twisted.names.dns import Record_AAAA
+from twisted.names.dns import AAAA, Record_AAAA, RRHeader
 from twisted.names.error import (
     AuthoritativeDomainError,
     DNSQueryTimeoutError,
@@ -2431,7 +2431,11 @@ class TestSafeGetaddrinfo(MAASTestCase):
         mock_resolver = Mock()
         mock_resolver.lookupIPV6Address = lambda _: succeed(
             (
-                [Record_AAAA(address="::")],
+                [
+                    RRHeader(
+                        name="::", type=AAAA, payload=Record_AAAA(address="::")
+                    )
+                ],
                 [],
                 [],
             )
@@ -2448,7 +2452,13 @@ class TestSafeGetaddrinfo(MAASTestCase):
         mock_resolver = Mock()
         mock_resolver.lookupIPV6Address = lambda _: succeed(
             (
-                [Record_AAAA(address="::1")],
+                [
+                    RRHeader(
+                        name="example.com",
+                        type=AAAA,
+                        payload=Record_AAAA(address="::1"),
+                    )
+                ],
                 [],
                 [],
             )