DELEGI -> DELEGPARAM

diff --git a/dns/rdatatype.py b/dns/rdatatype.py
index 60cd0556e4007cfd3ffdd34ffbd4ea424da1532e..cdabcfaac1c320183ffe29b4b3e344bc5cadbd33 100644 (file)
--- a/dns/rdatatype.py
+++ b/dns/rdatatype.py
@@ -111,7 +111,7 @@ class RdataType(dns.enum.IntEnum):
     DLV = 32769
     # Temporary DELEG values
     DELEG = 61440
-    DELEGI = 65433
+    DELEGPARAM = 65433
 
     @classmethod
     def _maximum(cls):
@@ -338,6 +338,6 @@ WALLET = RdataType.WALLET
 TA = RdataType.TA
 DLV = RdataType.DLV
 DELEG = RdataType.DELEG
-DELEGI = RdataType.DELEGI
+DELEGPARAM = RdataType.DELEGPARAM
 
 ### END generated RdataType constants

diff --git a/dns/rdtypes/IN/DELEGI.py b/dns/rdtypes/IN/DELEGPARAM.py
similarity index 68%
rename from dns/rdtypes/IN/DELEGI.py
rename to dns/rdtypes/IN/DELEGPARAM.py
index 11ab39c3f31dc8c42089bb9893b14bd19bfeb499..2240011fd3b6f71dbbc21ef9e25286a64a47721d 100644 (file)
--- a/dns/rdtypes/IN/DELEGI.py
+++ b/dns/rdtypes/IN/DELEGPARAM.py
@@ -5,5 +5,5 @@ import dns.rdtypes.delegbase
 
 
 @dns.immutable.immutable  # pyright: ignore
-class DELEGI(dns.rdtypes.delegbase.DelegBase):
-    """DELEGI record"""
+class DELEGPARAM(dns.rdtypes.delegbase.DelegBase):
+    """DELEGPARAM record"""

diff --git a/dns/rdtypes/IN/__init__.py b/dns/rdtypes/IN/__init__.py
index 7751320f9e1c739aeccd4c69237ca50623260e49..99745e8018eb40463ca692d533219b780087e4de 100644 (file)
--- a/dns/rdtypes/IN/__init__.py
+++ b/dns/rdtypes/IN/__init__.py
@@ -22,7 +22,7 @@ __all__ = [
     "AAAA",
     "APL",
     "DELEG",
-    "DELEGI",
+    "DELEGPARAM",
     "DHCID",
     "HTTPS",
     "IPSECKEY",

diff --git a/dns/rdtypes/delegbase.py b/dns/rdtypes/delegbase.py
index ab1d527aa99234a66448d2ae2c55ec2ee8212c65..7292445c3efc218e14a4a64ffd43cadd027cf81a 100644 (file)
--- a/dns/rdtypes/delegbase.py
+++ b/dns/rdtypes/delegbase.py
@@ -30,7 +30,7 @@ class DelegInfoKey(dns.enum.IntEnum):
     SERVER_IPV4 = 1
     SERVER_IPV6 = 2
     SERVER_NAME = 3
-    INCLUDE_DELEGI = 4
+    INCLUDE_DELEGPARAM = 4
 
     @classmethod
     def _maximum(cls):
@@ -360,7 +360,7 @@ _class_for_key: Dict[DelegInfoKey, Any] = {
     DelegInfoKey.SERVER_IPV4: ServerIPv4Info,
     DelegInfoKey.SERVER_IPV6: ServerIPv6Info,
     DelegInfoKey.SERVER_NAME: NameSetInfo,
-    DelegInfoKey.INCLUDE_DELEGI: NameSetInfo,
+    DelegInfoKey.INCLUDE_DELEGPARAM: NameSetInfo,
 }
 
 
@@ -408,7 +408,7 @@ class DelegBase(dns.rdata.Rdata):
         have_v4 = infos.get(DelegInfoKey.SERVER_IPV4)
         have_v6 = infos.get(DelegInfoKey.SERVER_IPV6)
         have_server_name = infos.get(DelegInfoKey.SERVER_NAME)
-        have_include = infos.get(DelegInfoKey.INCLUDE_DELEGI)
+        have_include = infos.get(DelegInfoKey.INCLUDE_DELEGPARAM)
         if (have_v4 or have_v6) and (have_server_name or have_include):
             raise ValueError(
                 "an address DELEG cannot have a server-name or include-delegi"

diff --git a/tests/example b/tests/example
index a67477d65dc6e52038a4d831b5c6cba6ad2ceb28..e7978cb57e13dcc6d2cb2691a1a4e54144cad8ef 100644 (file)
--- a/tests/example
+++ b/tests/example
@@ -270,5 +270,6 @@ wallet                  WALLET EXAMPLE 01234567890abcdef
 dsync                   DSYNC CDS NOTIFY 5300 notify-endpoint.parent.net.
 dsync                   DSYNC CSYNC 128 443 notify-endpoint.parent.net.
 deleg                                  DELEG server-ipv4=1.2.3.4 server-ipv6=1:2:3:4:5:6:7:8
-deleg                                  DELEG include-delegi=delegi.example.
+deleg                                  DELEG include-delegparam=delegparam.example.
 deleg                                  DELEG server-name=a.example.com.,b.example.com.
+delegparam                             DELEGPARAM server-ipv4=1.2.3.5 server-ipv6=1:2:3:4:5:6:7:9

diff --git a/tests/example1.good b/tests/example1.good
index ea01ba9e5ecc0905d6bb6e0fa8e0aecbc7efb9ed..03d488df0f4da1d2e2eddeec03c371bb215f422b 100644 (file)
--- a/tests/example1.good
+++ b/tests/example1.good
@@ -37,8 +37,9 @@ cname03 3600 IN CNAME .
 csync0 3600 IN CSYNC 12345 0 A MX RRSIG NSEC TYPE1234
 d 300 IN A 73.80.65.49
 deleg 3600 IN DELEG server-ipv4="1.2.3.4" server-ipv6="1:2:3:4:5:6:7:8"
-deleg 3600 IN DELEG include-delegi="delegi"
+deleg 3600 IN DELEG include-delegparam="delegparam"
 deleg 3600 IN DELEG server-name="a.example.com.,b.example.com."
+delegparam 3600 IN DELEGPARAM server-ipv4="1.2.3.5" server-ipv6="1:2:3:4:5:6:7:9"
 dhcid01 3600 IN DHCID AAIBY2/AuCccgoJbsaxcQc9TUapptP69 lOjxfNuVAA2kjEA=
 dhcid02 3600 IN DHCID AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQd WL3b/NaiUDlW2No=
 dhcid03 3600 IN DHCID AAABxLmlskllE0MVjd57zHcWmEH3pCQ6 VytcKD//7es/deY=

diff --git a/tests/example2.good b/tests/example2.good
index 4562b38b6470427195f42ae6bc3228c36b2ec997..132e99bda06756d22ce66fd92c9196d40a68f10b 100644 (file)
--- a/tests/example2.good
+++ b/tests/example2.good
@@ -37,8 +37,9 @@ cname03.example. 3600 IN CNAME .
 csync0.example. 3600 IN CSYNC 12345 0 A MX RRSIG NSEC TYPE1234
 d.example. 300 IN A 73.80.65.49
 deleg.example. 3600 IN DELEG server-ipv4="1.2.3.4" server-ipv6="1:2:3:4:5:6:7:8"
-deleg.example. 3600 IN DELEG include-delegi="delegi.example."
+deleg.example. 3600 IN DELEG include-delegparam="delegparam.example."
 deleg.example. 3600 IN DELEG server-name="a.example.com.,b.example.com."
+delegparam.example. 3600 IN DELEGPARAM server-ipv4="1.2.3.5" server-ipv6="1:2:3:4:5:6:7:9"
 dhcid01.example. 3600 IN DHCID AAIBY2/AuCccgoJbsaxcQc9TUapptP69 lOjxfNuVAA2kjEA=
 dhcid02.example. 3600 IN DHCID AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQd WL3b/NaiUDlW2No=
 dhcid03.example. 3600 IN DHCID AAABxLmlskllE0MVjd57zHcWmEH3pCQ6 VytcKD//7es/deY=

diff --git a/tests/example3.good b/tests/example3.good
index ea01ba9e5ecc0905d6bb6e0fa8e0aecbc7efb9ed..03d488df0f4da1d2e2eddeec03c371bb215f422b 100644 (file)
--- a/tests/example3.good
+++ b/tests/example3.good
@@ -37,8 +37,9 @@ cname03 3600 IN CNAME .
 csync0 3600 IN CSYNC 12345 0 A MX RRSIG NSEC TYPE1234
 d 300 IN A 73.80.65.49
 deleg 3600 IN DELEG server-ipv4="1.2.3.4" server-ipv6="1:2:3:4:5:6:7:8"
-deleg 3600 IN DELEG include-delegi="delegi"
+deleg 3600 IN DELEG include-delegparam="delegparam"
 deleg 3600 IN DELEG server-name="a.example.com.,b.example.com."
+delegparam 3600 IN DELEGPARAM server-ipv4="1.2.3.5" server-ipv6="1:2:3:4:5:6:7:9"
 dhcid01 3600 IN DHCID AAIBY2/AuCccgoJbsaxcQc9TUapptP69 lOjxfNuVAA2kjEA=
 dhcid02 3600 IN DHCID AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQd WL3b/NaiUDlW2No=
 dhcid03 3600 IN DHCID AAABxLmlskllE0MVjd57zHcWmEH3pCQ6 VytcKD//7es/deY=

diff --git a/tests/example4.good b/tests/example4.good
index cd59bd1fa78dd99e5cb00ece73224508506957e6..bf1e2a23184d66886415e35c09083e8497655a7b 100644 (file)
--- a/tests/example4.good
+++ b/tests/example4.good
@@ -38,8 +38,9 @@ cname03 3600 IN CNAME .
 csync0 3600 IN CSYNC 12345 0 A MX RRSIG NSEC TYPE1234
 d 300 IN A 73.80.65.49
 deleg 3600 IN DELEG server-ipv4="1.2.3.4" server-ipv6="1:2:3:4:5:6:7:8"
-deleg 3600 IN DELEG include-delegi="delegi"
+deleg 3600 IN DELEG include-delegparam="delegparam"
 deleg 3600 IN DELEG server-name="a.example.com.,b.example.com."
+delegparam 3600 IN DELEGPARAM server-ipv4="1.2.3.5" server-ipv6="1:2:3:4:5:6:7:9"
 dhcid01 3600 IN DHCID AAIBY2/AuCccgoJbsaxcQc9TUapptP69 lOjxfNuVAA2kjEA=
 dhcid02 3600 IN DHCID AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQd WL3b/NaiUDlW2No=
 dhcid03 3600 IN DHCID AAABxLmlskllE0MVjd57zHcWmEH3pCQ6 VytcKD//7es/deY=