add require and multiple primary-match

data/aut-num/AS4242421080

@@ -3,6 +3,4 @@ as-name:            JLU5-AS
 admin-c:            JLU5-DN42
 tech-c:             JLU5-DN42
 mnt-by:             JLU5-MNT
-remarks:            Open peering with Wireguard, see https://jlu5.com/dn42 for
-remarks:            details and contact info
 source:             DN42

data/aut-num/AS4242423878

@@ -1,7 +0,0 @@
-aut-num:            AS4242423878
-as-name:            JELLYCHOU-AS
-descr:              Jelly Chou's Main network, open to peering.
-admin-c:            JELLYCHOU-DN42
-tech-c:             JELLYCHOU-DN42
-mnt-by:             JELLYCHOU-MNT
-source:             DN42

data/dns/zhyz.dn42

@@ -1,9 +1,9 @@
 domain:             zhyz.dn42
 descr:              https://zhyz.ru email:zhihuiyuze@gmail.com
 nserver:            ns1.zhyz.dn42 172.21.75.65
-nserver:            ns1.zhyz.dn42 fd37:03b3:cae6::65
+nserver:            ns1.zhyz.dn42 d37:03b3:cae6::65
 nserver:            ns2.zhyz.dn42 172.21.75.66
-nserver:            ns2.zhyz.dn42 fd37:03b3:cae6::66
+nserver:            ns2.zhyz.dn42 d37:03b3:cae6::66
 admin-c:            ZHYZ-DN42
 tech-c:             ZHYZ-DN42
 mnt-by:             ZHYZ-MNT

data/inet6num/fd6d:3f59:4c68::_48

@@ -1,10 +0,0 @@
-inet6num:           fd6d:3f59:4c68:0000:0000:0000:0000:0000 - fd6d:3f59:4c68:ffff:ffff:ffff:ffff:ffff
-netname:            JELLYCHOU-IPV6
-descr:              Jelly Chou's IP space
-country:            CN
-admin-c:            JELLYCHOU-DN42
-tech-c:             JELLYCHOU-DN42
-mnt-by:             JELLYCHOU-MNT
-status:             ASSIGNED
-cidr:               fd6d:3f59:4c68::/48
-source:             DN42

data/inetnum/172.20.229.112_29

@@ -1,5 +1,5 @@
-inetnum:            172.20.229.112 - 172.20.229.127
-cidr:               172.20.229.112/28
+inetnum:            172.20.229.112 - 172.20.229.119
+cidr:               172.20.229.112/29
 netname:            JLU5-NET
 descr:              jlu5 R&D network
 country:            CA

data/inetnum/172.20.238.128_27

@@ -1,9 +0,0 @@
-inetnum:            172.20.238.128 - 172.20.238.159
-netname:            JELLYCHOU-IPV4
-country:            CN
-admin-c:            JELLYCHOU-DN42
-tech-c:             JELLYCHOU-DN42
-mnt-by:             JELLYCHOU-MNT
-status:             ASSIGNED
-cidr:               172.20.238.128/27
-source:             DN42

data/mntner/JELLYCHOU-MNT

@@ -1,6 +0,0 @@
-mntner:             JELLYCHOU-MNT
-admin-c:            JELLYCHOU-DN42
-tech-c:             JELLYCHOU-DN42
-mnt-by:             JELLYCHOU-MNT
-source:             DN42
-auth:               pgp-fingerprint 55D5BE7A3CF2C6297D51DC27D10344E090301733

data/mntner/ZHYZ-MNT

@@ -5,5 +5,4 @@ mnt-by:             ZHYZ-MNT
 source:             DN42
 auth:               pgp-fingerprint 3063182DC8DDC8295327D968F81C854AA3BF45F7
 auth:               ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCkJnS/PblMLT3pzFwD+otLnP5WuD62YBsASTdKIspQZc41RCyVw8EBJzJH6OeJ/PmsFm6bdI8YakzK0K1EPkmybiorbznbu4w8gpUJdK5WundTzZS2xGCmPLJRoh1n4UlyF3j2+oEbQTamYKls9KX133vlzr86l0KdQrTNMHpJdWyRUJqRQrocrqSbMl3qWsvxJJuIca4vRN76Xkgrj1es6FZ763AWSLWXVKNXF+2n8RfjPH0NJRebxiee0HHjmExgc8najhbHmEp0fX+3mGrNCZERNkRptQwaQPNwsdvtvIW0NPEjIGJdEBkDO/QRdatXXQVLFTn7+/scrPuyi/Itdb62/wbbEyF06he99Kle4c9RBh1Y1k+IoEXkpI+lp0RY3yhBzZ3NQXDffnLnNeKhPIOpyGOSMCtbd8mZjvwPH7hfaAVlzvUhsMKBu/chtOyaj9oqJ4SuYK2PNIYrR36zksL1wVK+kzpOI9y/i62WzVMwNWxVrgfHqu2ySQKQ7ss=
-auth:		     ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKkGNRBQ2BNqYDj5WCTvgMHGwSCBOzwhi8mfdfVy0woO
 remarks:            The maintainer's telegram are zhihuiyuze

data/person/JELLYCHOU-DN42

@@ -1,5 +0,0 @@
-person:             Jelly Chou
-contact:            dvfanzrfo@gmail.com
-nic-hdl:            JELLYCHOU-DN42
-mnt-by:             JELLYCHOU-MNT
-source:             DN42

data/route/172.20.229.112_29

@@ -1,4 +1,4 @@
-route:              172.20.229.112/28
+route:              172.20.229.112/29
 origin:             AS4242421080
 mnt-by:             JLU5-MNT
 source:             DN42

data/route/172.20.238.128_27

@@ -1,4 +0,0 @@
-route:              172.20.238.128/27
-origin:             AS4242423878
-mnt-by:             JELLYCHOU-MNT
-source:             DN42

data/route6/fd6d:3f59:4c68::_48

@@ -1,6 +0,0 @@
-route6:             fd6d:3f59:4c68::/48
-descr:              Jelly Chou's IP space
-origin:             AS4242423878
-origin:             AS4242423878
-mnt-by:             JELLYCHOU-MNT
-source:             DN42

data/schema/AS-BLOCK-SCHEMA

@@ -8,5 +8,6 @@ key:                admin-c    optional  multiple  lookup=dn42.person,dn42.role
 key:                tech-c     optional  multiple  lookup=dn42.person,dn42.role
 key:                remarks    optional  multiple
 key:                source     required  single    lookup=dn42.registry
+primary-match:      AS[0-9]{1,11}-AS[0-9]{1,11}
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/AS-SET-SCHEMA

@@ -9,5 +9,6 @@ key:                admin-c     optional  multiple  lookup=dn42.person,dn42.role
 key:                tech-c      optional  multiple  lookup=dn42.person,dn42.role
 key:                remarks     optional  multiple
 key:                source      required  single    lookup=dn42.registry
+primary-match:      [A-Z][0-9A-Z:-]{0,62}
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/AUT-NUM-SCHEMA

@@ -19,5 +19,6 @@ key:                mp-default optional  multiple
 key:                geo-loc    optional  multiple > [lat-c] [long-c] [name]
 key:                remarks    optional  multiple
 key:                source     required  single    lookup=dn42.registry
+primary-match:      AS[0-9]{1,11}
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/DNS-SCHEMA

@@ -12,5 +12,17 @@ key:                country    optional   single
 key:                ds-rdata   optional   multiple
 key:                remarks    optional   multiple
 key:                source     required   single    lookup=dn42.registry
+primary-match:      [0-9a-z-]{1,58}.dn42
+                    dn42
+                    ff[0-9a-z]{0,8}
+                    adm
+                    fmie
+                    hack
+                    helgo
+                    icvpn
+                    mueritz
+                    neo
+                    rzl
+                    020
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/INET6NUM-SCHEMA

@@ -18,6 +18,7 @@ key:                mnt-routes  optional   multiple  lookup=dn42.mntner
 key:                org         optional   single    lookup=dn42.organisation
 key:                remarks     optional   multiple
 key:                source      required   single    lookup=dn42.registry
+primary-match:      [0-9a-f:\.]+/[0-9]+
 network-owner:      inet6num
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/INETNUM-SCHEMA

@@ -18,6 +18,7 @@ key:                mnt-routes  optional  multiple  lookup=dn42.mntner
 key:                org         optional  single    lookup=dn42.organisation
 key:                remarks     optional  multiple
 key:                source      required  single    lookup=dn42.registry
+primary-match:      [0-9\.]+/[0-9]+
 network-owner:      inet6num
 network-owner:      inetnum
 mnt-by:             DN42-MNT

data/schema/KEY-CERT-SCHEMA

@@ -11,5 +11,7 @@ key:                admin-c      optional  multiple  lookup=dn42.person,dn42.rol
 key:                tech-c       optional  multiple  lookup=dn42.person,dn42.role
 key:                mnt-by       required  multiple  lookup=dn42.mntner
 key:                source       required  single
+primary-match:      PGPKEY-[0-9A-F]{8}
+primary-match:      MTN-[0-9A-Z-]{1,58}
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/MNTNER-SCHEMA

@@ -10,5 +10,6 @@ key:                org            optional  multiple  lookup=dn42.organisation
 key:                abuse-mailbox  optional  single
 key:                remarks        optional  multiple
 key:                source         required  single    lookup=dn42.registry
+primary-match:      [0-9A-Z-]+-MNT
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/ORGANISATION-SCHEMA

@@ -18,5 +18,6 @@ key:                language       optional  multiple
 key:                remarks        optional  multiple
 key:                address        optional  multiple
 key:                source         required  single    lookup=dn42.registry
+primary-match:      ORG-[0-9A-Z-]+
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/PERSON-SCHEMA

@@ -15,5 +15,6 @@ key:                fax-no          optional   multiple
 key:                address         optional   multiple
 key:                remarks         optional   multiple
 key:                source          required   single    lookup=dn42.registry
+primary-match:      [0-9A-Z-]+-[0-9A-Z]+
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/REGISTRY-SCHEMA

@@ -7,5 +7,6 @@ key:                mnt-by     required  multiple  lookup=dn42.mntner
 key:                admin-c    optional  multiple  lookup=dn42.person,dn42.role
 key:                tech-c     optional  multiple  lookup=dn42.person,dn42.role
 key:                source     required  single    lookup=dn42.registry
+primary-match:      [A-Z0-9]+
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/ROLE-SCHEMA

@@ -11,5 +11,6 @@ key:                abuse-mailbox   optional   multiple
 key:                descr           optional   single
 key:                remarks         optional   multiple
 key:                source          required   single    lookup=dn42.registry
+primary-match:      [0-9A-Z-]+-[0-9A-Z]+
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/ROUTE-SCHEMA

@@ -11,6 +11,7 @@ key:                remarks     optional  multiple
 key:                source      required  single    lookup=dn42.registry
 key:                pingable    optional  multiple
 key:                max-length  optional  single
+primary-match:      [0-9\.]+/[0-9]+
 network-owner:      inetnum
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/ROUTE-SET-SCHEMA

@@ -10,5 +10,6 @@ key:                admin-c      optional  multiple  lookup=dn42.person,dn42.rol
 key:                tech-c       optional  multiple  lookup=dn42.person,dn42.role
 key:                remarks      optional  multiple
 key:                source       required  single    lookup=dn42.registry
+primary-match:      RS-[0-9A-Z-]+
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/ROUTE6-SCHEMA

@@ -11,6 +11,7 @@ key:                remarks     optional  multiple
 key:                source      required  single    lookup=dn42.registry
 key:                pingable    optional  multiple
 key:                max-length  optional  single
+primary-match:      [0-9a-f:\.]+/[0-9]+
 network-owner:      inet6num
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/SCHEMA-SCHEMA

@@ -14,10 +14,12 @@ key:                mnt-by           required multiple   lookup=dn42.mntner > [m
 key:                remarks          optional multiple > [text]...
 key:                source           required single     lookup=dn42.registry
 key:                network-owner    optional multiple > [parent-schema]
+key:                primary-match    required multiple > [match]
 key:                key              required multiple > [key-name]
                     {required|optional|recommend|deprecate}
                     {single|multiple} {primary|} {schema|}
                     lookup=str '>' [spec]...
+primary-match:      [0-9A-Z-]+-SCHEMA
 mnt-by:             DN42-MNT
 source:             DN42
 remarks:            # option descriptions

data/schema/TINC-KEY-SCHEMA

@@ -13,5 +13,6 @@ key:                admin-c       optional  multiple  lookup=dn42.person,dn42.ro
 key:                tech-c        optional  multiple  lookup=dn42.person,dn42.role
 key:                mnt-by        required  multiple  lookup=dn42.mntner
 key:                source        required  single    lookup=dn42.registry
+primary-match:      [0-9A-Z-]+-TINC
 mnt-by:             DN42-MNT
 source:             DN42

data/schema/TINC-KEYSET-SCHEMA

@@ -8,5 +8,6 @@ key:                admin-c      optional  multiple  lookup=dn42.person,dn42.rol
 key:                tech-c       optional  multiple  lookup=dn42.person,dn42.role
 key:                mnt-by       required  multiple  lookup=dn42.mntner
 key:                source       required  single    lookup=dn42.registry
+primary-match:      [0-9A-Z-]+-TINC-KEYSET
 mnt-by:             DN42-MNT
 source:             DN42