diff --git a/data/as-set/AS-VITALE b/data/as-set/AS-VITALE index f6ea6b944..effe881ac 100644 --- a/data/as-set/AS-VITALE +++ b/data/as-set/AS-VITALE @@ -1,7 +1,6 @@ as-set: AS-VITALE descr: Vitale Networks AS Set members: AS4242429991 -org: ORG-VITALE admin-c: SCARLET-DN42 tech-c: SCARLET-DN42 mnt-by: VITALE-MNT diff --git a/data/aut-num/AS4242420467 b/data/aut-num/AS4242420467 index b9f20a77e..ec555ef97 100644 --- a/data/aut-num/AS4242420467 +++ b/data/aut-num/AS4242420467 @@ -1,4 +1,5 @@ aut-num: AS4242420467 +as-name: AS4242420467 admin-c: REISENB-DN42 tech-c: REISENB-DN42 mnt-by: REISENB-MNT diff --git a/data/aut-num/AS4242422378 b/data/aut-num/AS4242422378 index c1179d90e..8e79b76f0 100644 --- a/data/aut-num/AS4242422378 +++ b/data/aut-num/AS4242422378 @@ -3,4 +3,3 @@ as-name: HPP-AS admin-c: DHAPP-DN42 tech-c: DHAPP-DN42 mnt-by: HPP-MNT -policy: open diff --git a/data/aut-num/AS4242423360 b/data/aut-num/AS4242423360 index de3ad5605..4801c0b39 100644 --- a/data/aut-num/AS4242423360 +++ b/data/aut-num/AS4242423360 @@ -2,7 +2,6 @@ aut-num: AS4242423360 as-name: ETH2-ANYCAST-AS descr: eth2 anycast ASN org: ORG-ETH2 -admin-c: ETH2-DN42 -tech-c: ETH2-DN42 +admin-c: REENING-DN42 +tech-c: REENING-DN42 mnt-by: ETH2-MNT -org: ORG-ETH2 diff --git a/data/aut-num/AS64636 b/data/aut-num/AS64636 new file mode 100644 index 000000000..ffb32a215 --- /dev/null +++ b/data/aut-num/AS64636 @@ -0,0 +1,6 @@ +aut-num: AS64636 +as-name: AS64636-AS +descr: AS64636 +admin-c: RZL-DN42 +tech-c: RZL-DN42 +mnt-by: DUMMY-MNT diff --git a/data/aut-num/AS64737 b/data/aut-num/AS64737 index ab9bf1a45..c56002ff9 100644 --- a/data/aut-num/AS64737 +++ b/data/aut-num/AS64737 @@ -1,6 +1,7 @@ aut-num: AS64737 as-name: XUU-AS descr: Xuu.dn42 network +x-userdef: User Defined Option. remarks: +---------------------------------------------+ remarks: ## Located in DE, California & Ontario ## remarks: ## Currently OPEN to new Peers ## diff --git a/data/aut-num/AS64760 b/data/aut-num/AS64760 index f8c48e4b8..e0bebd801 100644 --- a/data/aut-num/AS64760 +++ b/data/aut-num/AS64760 @@ -1,5 +1,6 @@ aut-num: AS64760 as-name: MTNS-AS -admin-c: ORG-MTNS +org: ORG-MTNS +admin-c: LM-DN42 tech-c: LM-DN42 mnt-by: MTNS-MNT diff --git a/data/aut-num/AS64826 b/data/aut-num/AS64826 deleted file mode 100644 index fe951e895..000000000 --- a/data/aut-num/AS64826 +++ /dev/null @@ -1,7 +0,0 @@ -aut-num: AS64826 -as-name: NETRAT-AS -descr: netrat's AS -remarks: route information goes here -admin-c: NETRAT-DN42 -tech-c: NETRAT-DN42 -mnt-by: DUMMY-MNT diff --git a/data/dns/as4747472742.dn42 b/data/dns/as4747472742.dn42 index 01a54c13b..dfb7b5431 100644 --- a/data/dns/as4747472742.dn42 +++ b/data/dns/as4747472742.dn42 @@ -1,5 +1,4 @@ domain: as4747472742.dn42 -country: GB admin-c: B101010-DN42 tech-c: B101010-DN42 mnt-by: B101010-MNT diff --git a/data/dns/grmml.dn42 b/data/dns/grmml.dn42 index 04514edf5..c23eeb4f2 100644 --- a/data/dns/grmml.dn42 +++ b/data/dns/grmml.dn42 @@ -1,7 +1,6 @@ domain: grmml.dn42 descr: GRMML Network Domain country: DE -country: FR admin-c: GRMML-DN42 tech-c: GRMML-DN42 mnt-by: GRMML-MNT diff --git a/data/dns/nicht.dn42 b/data/dns/nicht.dn42 index e00e69b67..923a83de0 100644 --- a/data/dns/nicht.dn42 +++ b/data/dns/nicht.dn42 @@ -1,5 +1,4 @@ domain: nicht.dn42 -country: DE admin-c: GIGA-DN42 tech-c: GIGA-DN42 mnt-by: GIGA-MNT diff --git a/data/inetnum/172.22.160.128_25 b/data/inetnum/172.22.160.128_25 index 8342c2348..b2005f7c4 100644 --- a/data/inetnum/172.22.160.128_25 +++ b/data/inetnum/172.22.160.128_25 @@ -2,10 +2,10 @@ inetnum: 172.22.160.128-172.22.160.255 netname: V2-IPV4-1-INIT descr: V2 Initial IP Block Internal Routing country: GB -org: ORG-V2 -admin-c: ALISTAIR-DN43 +org: ORG-V2 +admin-c: ALISTAIR-DN42 tech-c: ALISTAIR-DN42 mnt-by: V2-MNT status: ASSIGNED bgp-status: active -cidr: 172.22.160.128/25 +cidr: 172.22.160.128/25 diff --git a/data/inetnum/172.22.255.176_28 b/data/inetnum/172.22.255.176_28 index 8a01ae5d0..7b05e2ec3 100644 --- a/data/inetnum/172.22.255.176_28 +++ b/data/inetnum/172.22.255.176_28 @@ -1,7 +1,7 @@ inetnum: 172.22.255.176 - 172.22.255.191 netname: TINC-IX-2-NET descr: Tinc-IX-2 network -tinc-hosts: SET-2-DN42-TINC +remarks: tinc-hosts: SET-2-DN42-TINC admin-c: DOWNHILL-DN42 tech-c: DOWNHILL-DN42 mnt-by: DUMMY-MNT diff --git a/data/inetnum/172.22.64.0_24 b/data/inetnum/172.22.64.0_24 index af08902e9..d7f5ba537 100644 --- a/data/inetnum/172.22.64.0_24 +++ b/data/inetnum/172.22.64.0_24 @@ -1,14 +1,13 @@ inetnum: 172.22.64.0 - 172.22.64.255 -cidr: 172.22.64.0/24 +cidr: 172.22.64.0/24 netname: SCHRODINGER-DN42-INET4 descr: Schrodinger's hosted subnet INET4 country: FR admin-c: SCHRODINGER-DN42 tech-c: SCHRODINGER-DN42 -status: ASSIGNED mnt-by: SCHRODINGER-MNT status: ASSIGNED PI -nserver: ns1.schrodinger.dn42 -bgp-status: inactive 1505145605 -remarks: 1425938004 Will readvertise soon once new peerings are established. -remarks: 1432424317 Reactivated. +nserver: ns1.schrodinger.dn42 +bgp-status: inactive 1505145605 +remarks: 1425938004 Will readvertise soon once new peerings are established. +remarks: 1432424317 Reactivated. diff --git a/data/mntner/BLAZZING-MNT b/data/mntner/BLAZZING-MNT deleted file mode 100644 index da34b4f03..000000000 --- a/data/mntner/BLAZZING-MNT +++ /dev/null @@ -1,6 +0,0 @@ -mntner: BLAZZING-MNT -descr: BLAZZING-MNT -sha512-pw: ODJjMTE5OTdkNzdmYjczZmM0ODg3NmRjMWM0ZjQ4ZjllODc1ODYzZDk2Y2Y0YTc3YWY5NTIzOWU1MmNiM2Q1ZjdlMTYxNzQwODJhN2QwODgwMjljYWU5Y2E3Y2E4YWI1MzVlNWVmYmQ2Y2QxYjE0OGZmYTBlMzc3OTRmYjljNzk3YjcwNDBjNWUzODM0MTkyOGNmMjJlOTUyZWU3MTQwNTAzNTNkMjJlNWEwMTQzOWU0YTNhNzVjZjNhYTRiZGI2MzA4MjcwNDQ4YzVjNTFiMWQzNTA1MjdhNGM1YTFlMjExZmVjYzZlZTYxODg5ODYwMDFmOGY1OWY1YzQ2YmRhMTAyMmNlMmVhZDJmZjFjNjNhMzhlOTJmMGJlMzAwMDkzYjFkZGE0MzhlZjk0YWY1Y2U2NTJlOWVhMmM5Y2FhZDI5MjdlYWE4NWYwOGRlMWQ0MDNkYmE3MWEzYmIyZDIxYzk3YWJmZTY0Njg2NGQ2ZDEwOWM5MjVkOTNlNWNiYWZlNjE0NmNhNDg0ODMzODU2NWIyZjk3ODdhZjkyMmIzNTg2NjJjMDMyMTk3YWNiODc0ZmU3YWVlYTZmNmQ1MTFkZDJkNDBkYjliOTcwMDBkNzgzMjkwNWQ0N2I1MGMyMjE4MjRlMzQ0Mjc2NjY5Yjg5MTEyNDY2N2MyZTc0NzE3ZjU= -admin-c: ORG-SERVICES -tech-c: ORG-SERVICES -mnt-by: BLAZZING-MNT diff --git a/data/mntner/FLO-IX-MNT b/data/mntner/FLO-IX-MNT deleted file mode 100644 index 018730401..000000000 --- a/data/mntner/FLO-IX-MNT +++ /dev/null @@ -1,6 +0,0 @@ -mntner: FLO-IX-MNT -descr: FLO-IX is a DN42 Internet Exchange. -sha512-pw: NDBlNmZhZDRmYzM3MmIzZGU2MzI0NTdlM2ZlZjk5NTY4MjUyMzc2MTRmMTYxYjEyMzUwZTk5MzBhNzgyZTIzMTczNWFjMmQ4OWNiZGIyMTA0YTljY2EyNzRlYjQ1ZGJkMDk4YzY3NTAxM2ZjYmI3NzMwYzIxNjc1ODYzNGI3MmVkOTY0YTAwMWQ1NjllOTg4OTIzMjU2OTYxOGMyNTdhMDJjZmRmNWIyMDA1NGI0YmU3MjRjNjNhZDNhYWMwZTJmYTBmYzE2MzI1NzgwMzE2YTVjODg1YzAzZTIxOWY5NWFjZjY1OGYzMTU0MjEwM2M3MmI2OWUxYzdlOTU2YjYwYzgxYTIxNDg4MGRiN2U3NDFiNTk5YmMwYzk1YTBkNzgxMTQ1OTg0MjVkYjEwYTM1ZDU0MGEwZWQzNzE5N2YxZTk5YzdmMjRjMjc4Y2Q5YmM1ODYyYjBjN2UwYThkOWZjMTdmNDgyZDIzMzRlMWIwNjMyN2IzYzJiZmIyMThkNTA3ZDJiODkyNmExODdiZGVmMmNiMWM1ZjAzNTE1YjZlNWEyYmJjZDY4MTQ5MmRhM2Q5MzZmZmNkNTQ5ZjQ1OTE0YjhmM2E0NjdhMTg5N2RmYmE5YThmYjk1ZjMzYjgyMWNmMjRiMjdhMWZhODBkY2QyNzgxOGMxNGNkYzM4ZTczNTA= -admin-c: ORG-SERVICES -tech-c: ORG-SERVICES -mnt-by: FLO-IX-MNT diff --git a/data/mntner/ROELOFN-MNT b/data/mntner/ROELOFN-MNT index 66dd17251..43b843ef0 100644 --- a/data/mntner/ROELOFN-MNT +++ b/data/mntner/ROELOFN-MNT @@ -1,6 +1,5 @@ mntner: ROELOFN-MNT sha512-pw: OWU5Y2Q4NmNiZGU5ZmZmZDJlM2RkYmQ0NDVjY2EzMjQ5NzdkZGVlY2JjODFkNzQ2NWZiMGEzZDZjMTk2YTM1YjE3NGE0MzllNDZlZWIzZDQ2MDZhNTdjMzliMGVhNTBhYTRjMjM0YjFjM2JmNzg0MzcwYTRhMzRhNDg3NDg0M2E2YjRlMjQ4NTllNjhlODZkYmVlOTBkMzhlYWUxNGNmMTc1ZDQzMTczMDVjOGM2YTUxYjliMzFkYjMwMGYwYjUyMjZmMjBjZDk1ZDBlZmM1MGNjNDhlNjUyMTJjYWNmNjIzZjhhNzMzYjg1M2Q3Y2UxNzAzMTQ2YmI3YWVkMDViY2QxZmQ3ZmNkN2FhMzBiZmE1MjkzNDVjYjJlZmUzYTA0MWQzNzAxYzliM2Y4MDRkNTc5MmYwM2Y4MWQ0MTBiYjFmOTM2ZGY1MGFlZTg2MTZmYmM1Mjg3NTI0NjA2MWE4NDY3ZjgzYjAxZGNhNjllODBjMmQyMTEzMGExZjNmNmJmYTUxMDA2MjA3ZmQ3NGVmY2IzZTMxNTdlYWJiNzI2NTI4ZDk0NGRmMTc5Yjk0NzZiYWI0YWRhYWExNzA2OWNlMjg4ODdhYzIzZWYwZjkzMzg4OThkYTIwMmY3NGMyMmQyYTA1ZDAxOGMxYTA4YjgzZTczM2MxNTlkYjYxOTc1MTA= -sha512-pw: OWU5Y2Q4NmNiZGU5ZmZmZDJlM2RkYmQ0NDVjY2EzMjQ5NzdkZGVlY2JjODFkNzQ2NWZiMGEzZDZjMTk2YTM1YjE3NGE0MzllNDZlZWIzZDQ2MDZhNTdjMzliMGVhNTBhYTRjMjM0YjFjM2JmNzg0MzcwYTRhMzRhNDg3NDg0M2E2YjRlMjQ4NTllNjhlODZkYmVlOTBkMzhlYWUxNGNmMTc1ZDQzMTczMDVjOGM2YTUxYjliMzFkYjMwMGYwYjUyMjZmMjBjZDk1ZDBlZmM1MGNjNDhlNjUyMTJjYWNmNjIzZjhhNzMzYjg1M2Q3Y2UxNzAzMTQ2YmI3YWVkMDViY2QxZmQ3ZmNkN2FhMzBiZmE1MjkzNDVjYjJlZmUzYTA0MWQzNzAxYzliM2Y4MDRkNTc5MmYwM2Y4MWQ0MTBiYjFmOTM2ZGY1MGFlZTg2MTZmYmM1Mjg3NTI0NjA2MWE4NDY3ZjgzYjAxZGNhNjllODBjMmQyMTEzMGExZjNmNmJmYTUxMDA2MjA3ZmQ3NGVmY2IzZTMxNTdlYWJiNzI2NTI4ZDk0NGRmMTc5Yjk0NzZiYWI0YWRhYWExNzA2OWNlMjg4ODdhYzIzZWYwZjkzMzg4OThkYTIwMmY3NGMyMmQyYTA1ZDAxOGMxYTA4YjgzZTczM2MxNTlkYjYxOTc1MTA= admin-c: ROELOFN-DN42 tech-c: ROELOFN-DN42 mnt-by: ROELOFN-MNT diff --git a/data/organisation/ORG-YANG b/data/organisation/ORG-YANG index 11a2a029c..f42e959c3 100644 --- a/data/organisation/ORG-YANG +++ b/data/organisation/ORG-YANG @@ -1,7 +1,7 @@ organisation: ORG-YANG org-name: YANG Network descr: dn42 Yang Network -bitcoin: 17Mp9utV1E7MarPramE3Smv3zMoCxhNpwk +remarks: bitcoin: 17Mp9utV1E7MarPramE3Smv3zMoCxhNpwk admin-c: YANG-DN42 tech-c: YANG-DN42 mnt-by: YANG-MNT diff --git a/data/person/SECURE-DN42 b/data/person/SECURE-DN42 deleted file mode 100644 index 3108542f7..000000000 --- a/data/person/SECURE-DN42 +++ /dev/null @@ -1,4 +0,0 @@ -person: Secure -e-mail: secure@twice-irc.de -nic-hdl: SECURE-DN42 -mnt-by: SECURE-MNT diff --git a/data/person/TRUNET-DN42 b/data/person/TRUNET-DN42 index 707fee4ec..fbc0dfb7d 100644 --- a/data/person/TRUNET-DN42 +++ b/data/person/TRUNET-DN42 @@ -3,5 +3,4 @@ contact: mail:trunet@trunet.dn42 pgp-id: 2A094EBB pgp-fingerprint: 26D0 1144 D4DC 41B1 5A59 A4D4 5C57 B51B 2A09 4EBB nic-hdl: TRUNET-DN42 -aut-num: AS4242422009 mnt-by: TRUNET-MNT diff --git a/data/role/ALENAN-DN42 b/data/role/ALENAN-DN42 new file mode 100644 index 000000000..07d5d85cf --- /dev/null +++ b/data/role/ALENAN-DN42 @@ -0,0 +1,8 @@ +role: Alenan Org Role +nic-hdl: ALENAN-DN42 +admin-c: VMANN-DN42 +admin-c: MUMU-DN42 +tech-c: VMANN-DN42 +tech-c: MUMU-DN42 +mnt-by: VMANN-MNT + diff --git a/data/role/CCCKC-DN42 b/data/role/CCCKC-DN42 new file mode 100644 index 000000000..0f90f0830 --- /dev/null +++ b/data/role/CCCKC-DN42 @@ -0,0 +1,7 @@ +role: CCCKC-DN42 +nic-hdl: CCCKC-DN42 +abuse-mailbox: networking@c3kc.org +admin-c: TAGNO25-DN42 +tech-c: TAGNO25-DN42 +mnt-by: TAGNO25-MNT + diff --git a/data/role/FLHB-ADMIN-DN42 b/data/role/FLHB-ADMIN-DN42 index 4dccecac7..5f9d6d712 100644 --- a/data/role/FLHB-ADMIN-DN42 +++ b/data/role/FLHB-ADMIN-DN42 @@ -1,5 +1,5 @@ role: FabLab Bremen Administrator Group -e-mail: fritz+dn42@grimpen.net +abuse-mailbox: fritz+dn42@grimpen.net admin-c: FRITZ-DN42 admin-c: PYROPETER-DN42 tech-c: FRITZ-DN42 diff --git a/data/role/ORG-YANE-DN42 b/data/role/ORG-YANE-DN42 new file mode 100644 index 000000000..75a17a3eb --- /dev/null +++ b/data/role/ORG-YANE-DN42 @@ -0,0 +1,7 @@ +role: Yet Another Network Engineers vIXP +nic-hdl: ORG-YANE-DN42 +descr: Virtual IXP for education purposes +admin-c: XENTRIX-DN42 +tech-c: XENTRIX-DN42 +mnt-by: YANE-MNT + diff --git a/data/route/172.22.191.128_25 b/data/route/172.22.191.128_25 deleted file mode 100644 index d8b32d594..000000000 --- a/data/route/172.22.191.128_25 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.22.191.128/25 -descr: RRIX SERVER -origin: AS64711 -bgp-status: active -mnt-by: DUMMY-MNT diff --git a/data/schema/AUT-NUM-SCHEMA b/data/schema/AUT-NUM-SCHEMA index 591ea71b4..a2ff3418d 100644 --- a/data/schema/AUT-NUM-SCHEMA +++ b/data/schema/AUT-NUM-SCHEMA @@ -11,6 +11,8 @@ key: org optional single lookup=dn42.organisation key: import optional deprecate multiple key: export optional deprecate multiple key: default optional deprecate multiple +key: mp-peer depricate multiple +key: mp-group depricate multiple key: mp-import optional multiple key: mp-export optional multiple key: mp-default optional multiple diff --git a/data/schema/TINC-KEY-SCHEMA b/data/schema/TINC-KEY-SCHEMA index 66a1472e8..8970d034f 100644 --- a/data/schema/TINC-KEY-SCHEMA +++ b/data/schema/TINC-KEY-SCHEMA @@ -4,6 +4,7 @@ key: tinc-key required single primary schema key: tinc-host required single key: tinc-file required single key: descr optional single +key: remarks optional multiple key: compression optional single key: subnet optional multiple key: tinc-address optional single @@ -11,4 +12,5 @@ key: port optional single key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: mnt-by required multiple lookup=dn42.mntner - +mnt-by: XUU-MNT +mnt-by: HEXA-MNT diff --git a/data/schema/TINC-KEYSET-SCHEMA b/data/schema/TINC-KEYSET-SCHEMA index 6c57a0552..438ceba57 100644 --- a/data/schema/TINC-KEYSET-SCHEMA +++ b/data/schema/TINC-KEYSET-SCHEMA @@ -2,8 +2,10 @@ schema: TINC-KEYSET-SCHEMA ref: dn42.tinc-keyset key: tinc-keyset required single primary schema key: descr optional single +key: remarks optional multiple key: member required multiple lookup=dn42.tinc-key key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: mnt-by required multiple lookup=dn42.mntner - +mnt-by: XUU-MNT +mnt-by: HEXA-MNT diff --git a/data/tinc-key/AS76103IX-TINC b/data/tinc-key/AS76103IX-TINC index a27d7b6b6..eded0f42f 100644 --- a/data/tinc-key/AS76103IX-TINC +++ b/data/tinc-key/AS76103IX-TINC @@ -5,7 +5,7 @@ compression: 9 subnet: 172.23.3.1/32 tinc-address: 89.212.170.109 port: 10409 -admin-c: ORG-NIXNODES +admin-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT tinc-file: Subnet = 172.23.3.1/32 diff --git a/data/tinc-key/AS76103US-TINC b/data/tinc-key/AS76103US-TINC index f4eae9de3..986a291e1 100644 --- a/data/tinc-key/AS76103US-TINC +++ b/data/tinc-key/AS76103US-TINC @@ -5,7 +5,7 @@ compression: 9 subnet: 172.23.3.3/32 tinc-address: 71.19.233.189 port: 10409 -admin-c: ORG-NIXNODES +admin-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT tinc-file: Subnet = 172.23.3.3/32 diff --git a/data/tinc-key/DEELKAR-TINC b/data/tinc-key/DEELKAR-TINC index 588aa0e74..a3e285047 100644 --- a/data/tinc-key/DEELKAR-TINC +++ b/data/tinc-key/DEELKAR-TINC @@ -1,7 +1,7 @@ tinc-key: DEELKAR-TINC tinc-host: deelkar -descr: * This object was generated based on info from legacy -descr: * wiki and existing host files +remarks: * This object was generated based on info from legacy +remarks: * wiki and existing host files compression: 9 subnet: 172.22.255.187/32 tinc-address: 83.169.16.132 diff --git a/data/tinc-key/FLONET-SITE1-TINC b/data/tinc-key/FLONET-SITE1-TINC index ec8444598..f42ad56d9 100644 --- a/data/tinc-key/FLONET-SITE1-TINC +++ b/data/tinc-key/FLONET-SITE1-TINC @@ -1,4 +1,5 @@ tinc-key: FLONET-SITE1-TINC +tinc-host: flonet compression: 9 mnt-by: DUMMY-MNT subnet: 172.23.67.8/32 diff --git a/data/tinc-key/NOSPOONUSER-TINC b/data/tinc-key/NOSPOONUSER-TINC index 2fc55b110..131449da4 100644 --- a/data/tinc-key/NOSPOONUSER-TINC +++ b/data/tinc-key/NOSPOONUSER-TINC @@ -1,7 +1,7 @@ tinc-key: NOSPOONUSER-TINC tinc-host: nospoonuser -descr: * This object was generated based on info from legacy -descr: * wiki and existing host files +remarks: * This object was generated based on info from legacy +remarks: * wiki and existing host files subnet: 172.22.255.188/32 tinc-address: 212.168.173.241 admin-c: NOSPOONUSER-DN42 diff --git a/data/tinc-key/UVES-TINC b/data/tinc-key/UVES-TINC index 73866e7a2..5e6093418 100644 --- a/data/tinc-key/UVES-TINC +++ b/data/tinc-key/UVES-TINC @@ -1,7 +1,7 @@ tinc-key: UVES-TINC tinc-host: spline -descr: * This object was generated based on info from legacy -descr: * wiki and existing host files +remarks: * This object was generated based on info from legacy +remarks: * wiki and existing host files compression: 9 subnet: 172.22.255.161/32 subnet: fd04:de02:7af9::161/128 diff --git a/data/tinc-keyset/SET-2-DN42-TINC b/data/tinc-keyset/SET-2-DN42-TINC index ea807635a..1324f01de 100644 --- a/data/tinc-keyset/SET-2-DN42-TINC +++ b/data/tinc-keyset/SET-2-DN42-TINC @@ -1,11 +1,11 @@ tinc-keyset: SET-2-DN42-TINC -# tinc cloud with 172.22.255.176/28 descr: dn42 tinc cloud #2 keyset +remarks: tinc cloud with 172.22.255.176/28 member: VUTRAL-TINC member: MARTIN89-TINC member: NOSPOONUSER-TINC member: DEELKAR-TINC member: STEPHANJ-TINC member: HEX-TINC -admin-c: DUMMY-DN42 +admin-c: NIXNODES-DN42 mnt-by: NIXNODES-MNT diff --git a/data/tinc-keyset/SET-AS76103IX-TINC b/data/tinc-keyset/SET-AS76103IX-TINC index 460d27f8e..eeb2af603 100644 --- a/data/tinc-keyset/SET-AS76103IX-TINC +++ b/data/tinc-keyset/SET-AS76103IX-TINC @@ -1,6 +1,5 @@ tinc-keyset: SET-AS76103IX-TINC member: AS76103IX-TINC -member: MMARKER-TINC member: AS76103US-TINC member: NULLL-TINC member: AS4242422703-TINC diff --git a/utils/schema-check/dn42-schema.py b/utils/schema-check/dn42-schema.py index 430c92f3b..b11211ec9 100755 --- a/utils/schema-check/dn42-schema.py +++ b/utils/schema-check/dn42-schema.py @@ -100,7 +100,10 @@ class SchemaDOM: status = "FAIL" for k, v, l in f.dom: - if k not in self.schema: + if k.startswith("x-"): + log.debug("%s Line %d: Key [%s] is user defined." % (f.src, l, k)) + + elif k not in self.schema: log.error("%s Line %d: Key [%s] not in schema." % (f.src, l, k)) status = "FAIL" continue @@ -288,6 +291,7 @@ def __index_files(path): "mntner/": SCHEMA_NAMESPACE + "mntner", "person/": SCHEMA_NAMESPACE + "person", "role/": SCHEMA_NAMESPACE + "role", + "tinc-key/": SCHEMA_NAMESPACE + "tinc-key", "tinc-keyset/": SCHEMA_NAMESPACE + "tinc-keyset", "schema/": SCHEMA_NAMESPACE + "schema", }