Merge ~cgrabowski/maas:fix_update_outside_of_zone_dns into maas:master

[Christian Grabowski]

use network ip and prefixlen of subnet when reverse zone is not given

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 4e2c59e7ac337a75a463301ce1ea3db7cd32a9a4

review: Approve

diff --git a/src/provisioningserver/dns/config.py b/src/provisioningserver/dns/config.py
index 264139e..7ee7b50 100644
--- a/src/provisioningserver/dns/config.py
+++ b/src/provisioningserver/dns/config.py
@@ -80,7 +80,13 @@ class DynamicDNSUpdate:
             name_split = ip.reverse_dns.split(".")
             suffix = [zone]
             if not zone:
-                suffix = [f"0-{subnet.prefixlen}"] + name_split[1:]
+                if ip.version == 4:
+                    first_octet = str(subnet.network).split(".")[-1]
+                else:
+                    first_octet = str(subnet.network).split(":")[-1]
+
+                suffix = [f"{first_octet}-{subnet.prefixlen}"] + name_split[1:]
+                zone = ".".join(suffix)
 
             name_split = name_split[:1] + suffix
             name = ".".join(name_split)
diff --git a/src/provisioningserver/dns/tests/test_config.py b/src/provisioningserver/dns/tests/test_config.py
index 35452ba..985e846 100644
--- a/src/provisioningserver/dns/tests/test_config.py
+++ b/src/provisioningserver/dns/tests/test_config.py
@@ -784,7 +784,7 @@ class TestDynamicDNSUpdate(MAASTestCase):
         expected_rev_update = DynamicDNSUpdate(
             operation="INSERT",
             zone=domain,
-            name="1.0-126.0.0.8.4.4.8.a.6.7.0.a.d.a.c.7.0.b.7.5.a.e.5.a.c.7.c.4.5.5.c.f.ip6.arpa.",
+            name="1.8000-126.0.0.8.4.4.8.a.6.7.0.a.d.a.c.7.0.b.7.5.a.e.5.a.c.7.c.4.5.5.c.f.ip6.arpa.",
             rectype="PTR",
             ttl=fwd_update.ttl,
             subnet=str(subnet),
@@ -796,3 +796,30 @@ class TestDynamicDNSUpdate(MAASTestCase):
         self.assertEqual(expected_rev_update.name, rev_update.name)
         self.assertEqual(expected_rev_update.rectype, rev_update.rectype)
         self.assertEqual(expected_rev_update.answer, rev_update.answer)
+
+    def test_as_reverse_record_update_no_zone_set(self):
+        domain = factory.make_name()
+        subnet = IPNetwork("10.1.1.128/25")
+        fwd_update = DynamicDNSUpdate(
+            operation="INSERT",
+            zone=domain,
+            name=f"{factory.make_name()}.{domain}",
+            rectype="A",
+            answer=str("10.1.1.161"),
+        )
+        expected_rev_update = DynamicDNSUpdate(
+            operation="INSERT",
+            zone="128-25.1.1.10.in-addr.arpa.",
+            name="161.128-25.1.1.10.in-addr.arpa.",
+            rectype="PTR",
+            ttl=fwd_update.ttl,
+            subnet=str(subnet),
+            answer=fwd_update.name,
+        )
+        rev_update = DynamicDNSUpdate.as_reverse_record_update(
+            fwd_update, subnet
+        )
+        self.assertEqual(expected_rev_update.name, rev_update.name)
+        self.assertEqual(expected_rev_update.rectype, rev_update.rectype)
+        self.assertEqual(expected_rev_update.answer, rev_update.answer)
+        self.assertEqual(expected_rev_update.zone, rev_update.zone)