From 318056d9c0c9fc118fcc77eaef00663cef57be95 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Tue, 27 Mar 2018 23:16:36 +0200 Subject: [PATCH] Fix schema errors and some other cleanups --- data/as-set/AS-CCCHB | 22 ++++++---------------- data/as-set/AS-MORTZU | 17 +---------------- data/as-set/AS-NL-ZUID-IX | 12 ------------ data/as-set/AS-WINTIX | 22 ---------------------- data/aut-num/{4242423160 => AS4242423160} | 0 data/aut-num/AS76198 | 8 ++++---- data/dns/nic.dn42 | 3 --- data/key-cert/MTN-FLHB-NETGROUP | 1 + data/key-cert/MTN-FRITZ | 1 + data/person/WINTIX-DN42 | 5 ----- data/route-set/RS-DN42 | 10 +++++++++- data/route-set/RS-DN42-NATIVE | 5 ++--- data/schema/AS-SET-SCHEMA | 2 +- data/schema/DNS-SCHEMA | 2 +- data/schema/KEY-CERT-SCHEMA | 14 ++++++++++++++ data/schema/MNTNER-SCHEMA | 2 +- data/schema/SCHEMA-SCHEMA | 2 +- data/schema/TINC-KEY-SCHEMA | 2 +- data/schema/TINC-KEYSET-SCHEMA | 2 +- 19 files changed, 44 insertions(+), 88 deletions(-) delete mode 100644 data/as-set/AS-WINTIX rename data/aut-num/{4242423160 => AS4242423160} (100%) delete mode 100644 data/person/WINTIX-DN42 create mode 100644 data/schema/KEY-CERT-SCHEMA diff --git a/data/as-set/AS-CCCHB b/data/as-set/AS-CCCHB index 0fd50f3e7..c19917a00 100644 --- a/data/as-set/AS-CCCHB +++ b/data/as-set/AS-CCCHB @@ -4,20 +4,10 @@ admin-c: CREST-DN42 admin-c: CREST-DN42 mnt-by: CREST-MNT remarks: as-block: 64824 - 64839 -x-members: AS64824 -x-members: AS64825 -x-members: AS64826 -x-members: AS64827 -x-members: AS64828 -x-members: AS64829 -x-members: AS64830 -x-members: AS64831 -x-members: AS64832 -x-members: AS64833 -x-members: AS64834 -x-members: AS64835 -x-members: AS64836 -x-members: AS64837 -x-members: AS64838 -x-members: AS64839 +members: AS64825 +members: AS64827 +members: AS64828 +members: AS64831 +members: AS64833 +members: AS64839 source: DN42 diff --git a/data/as-set/AS-MORTZU b/data/as-set/AS-MORTZU index 4d62d0935..c99351985 100644 --- a/data/as-set/AS-MORTZU +++ b/data/as-set/AS-MORTZU @@ -3,20 +3,5 @@ descr: mortzu ASN block admin-c: MORTZU-DN42 mnt-by: MORTZU-MNT remarks: as-block: 64792 - 64807 -x-members: AS64792 -x-members: AS64793 -x-members: AS64794 -x-members: AS64795 -x-members: AS64796 -x-members: AS64797 -x-members: AS64798 -x-members: AS64799 -x-members: AS64800 -x-members: AS64801 -x-members: AS64802 -x-members: AS64803 -x-members: AS64804 -x-members: AS64805 -x-members: AS64806 -x-members: AS64807 +members: AS64794 source: DN42 diff --git a/data/as-set/AS-NL-ZUID-IX b/data/as-set/AS-NL-ZUID-IX index 60343e3f7..4e408ff64 100644 --- a/data/as-set/AS-NL-ZUID-IX +++ b/data/as-set/AS-NL-ZUID-IX @@ -8,16 +8,4 @@ members: AS4242421340 admin-c: NL-ZUID-DN42 tech-c: NL-ZUID-DN42 mnt-by: MARLINC-MNT -remarks: AS block for NL Zuid exchanges and internal services -x-members: AS4242427000 -x-members: AS4242427001 -x-members: AS4242427002 -x-members: AS4242427003 -x-members: AS4242427004 -x-members: AS4242427005 -x-members: AS4242427006 -x-members: AS4242427007 -x-members: AS4242427008 -x-members: AS4242427009 -x-members: AS4242427010 source: DN42 diff --git a/data/as-set/AS-WINTIX b/data/as-set/AS-WINTIX deleted file mode 100644 index e85743e19..000000000 --- a/data/as-set/AS-WINTIX +++ /dev/null @@ -1,22 +0,0 @@ -as-set: AS-WINTIX -descr: wintix -admin-c: WINTIX-DN42 -mnt-by: DUMMY-MNT -remarks: as-block: 64808 - 64823 -x-members: AS64808 -x-members: AS64809 -x-members: AS64810 -x-members: AS64811 -x-members: AS64812 -x-members: AS64813 -x-members: AS64814 -x-members: AS64815 -x-members: AS64816 -x-members: AS64817 -x-members: AS64818 -x-members: AS64819 -x-members: AS64820 -x-members: AS64821 -x-members: AS64822 -x-members: AS64823 -source: DN42 diff --git a/data/aut-num/4242423160 b/data/aut-num/AS4242423160 similarity index 100% rename from data/aut-num/4242423160 rename to data/aut-num/AS4242423160 diff --git a/data/aut-num/AS76198 b/data/aut-num/AS76198 index c17894711..89276c3d8 100644 --- a/data/aut-num/AS76198 +++ b/data/aut-num/AS76198 @@ -6,14 +6,14 @@ remarks: Welcome to the DN42 autonomous system of Fablab Bremen and remarks: Chaos Computer Club Bremen. We have an open peering policy. remarks: ------------------------ remarks: Transit from AS64712 -x-import: from AS64712 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -x-export: to AS64712 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } +import: from AS64712 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +export: to AS64712 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } mp-import: afi ipv6 from AS64712 accept { fc00::/7^+ } mp-export: afi ipv6 to AS64712 announce { fdd6:aff6:5f6f::/48 } remarks: ------------------------ remarks: Transit from AS76115 -x-import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } -x-export: to AS76115 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } +import: from AS76115 accept { 172.16.0.0/12^+, 10.0.0.0/8^+ } +export: to AS76115 announce { 172.22.70.0/24, 172.23.198.0/24, 172.20.36.0/23 } mp-import: afi ipv6 from AS76115 accept { fc00::/7^+ } mp-export: afi ipv6 to AS76115 announce { fdd6:aff6:5f6f::/48 } admin-c: FRITZ-DN42 diff --git a/data/dns/nic.dn42 b/data/dns/nic.dn42 index 0a9d0e188..37c94d884 100644 --- a/data/dns/nic.dn42 +++ b/data/dns/nic.dn42 @@ -6,8 +6,5 @@ mnt-by: NIXNODES-MNT nserver: kapha.mtr.xuu.dn42 nserver: lavnana.sjc.xuu.dn42 nserver: rishi.bre.xuu.dn42 -x-nserver: ns1.nixnodes.dn42 -x-nserver: ns2.nixnodes.dn42 -x-nserver: ns3.nixnodes.dn42 status: EVALPEND 1503917671 source: DN42 diff --git a/data/key-cert/MTN-FLHB-NETGROUP b/data/key-cert/MTN-FLHB-NETGROUP index 8f9525967..c0d06011c 100644 --- a/data/key-cert/MTN-FLHB-NETGROUP +++ b/data/key-cert/MTN-FLHB-NETGROUP @@ -7,3 +7,4 @@ tech-c: FRITZ-DN42 tech-c: PYROPETER-DN42 tech-c: DEELKAR-DN42 mnt-by: FLHB-NETGROUP-MNT +source: DN42 diff --git a/data/key-cert/MTN-FRITZ b/data/key-cert/MTN-FRITZ index 3679116cc..428d01836 100644 --- a/data/key-cert/MTN-FRITZ +++ b/data/key-cert/MTN-FRITZ @@ -4,3 +4,4 @@ owner: fritz@grimpen.net fingerpr: cc3a6dd807903ba70874848ad74f4c627bac3720 certif: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGcchcJ4Id0PyPE6DnA2ShPgfkkhPuaPcQeTvobOpnO472VafcXZ2H1FdkIdYtdK+BMoGX7ndkcMzD91/QcOM5PkD+66BKQdL3WnUc1wRRPNA008qDjoqk1ddDPdG3uYtAsw0epZrRETLepYkNihhRDh/xmhqoPXo8Ax776rWV8QIDAQAB mnt-by: FRITZ-MNT +source: DN42 diff --git a/data/person/WINTIX-DN42 b/data/person/WINTIX-DN42 deleted file mode 100644 index 18159456b..000000000 --- a/data/person/WINTIX-DN42 +++ /dev/null @@ -1,5 +0,0 @@ -person: Wintix -contact: xmpp:wintix@jabber.ccc.de -nic-hdl: WINTIX-DN42 -mnt-by: DUMMY-MNT -source: DN42 diff --git a/data/route-set/RS-DN42 b/data/route-set/RS-DN42 index 565f95afd..cc9386304 100644 --- a/data/route-set/RS-DN42 +++ b/data/route-set/RS-DN42 @@ -1,9 +1,17 @@ route-set: RS-DN42 descr: extended dn42 networks -remark: contains the native dn42 network and ICANN assigned PI/PA space +remarks: contains the native dn42 network and ICANN assigned PI/PA space members: RS-DN42-NATIVE +mp-members: RS-DN42-NATIVE members: 195.16.84.40/29 +mp-members: 195.16.84.40/29 members: 37.1.89.160/29 +mp-members: 37.1.89.160/29 members: 46.19.90.48/28 +mp-members: 46.19.90.48/28 members: 46.19.90.96/28 +mp-members: 46.19.90.96/28 members: 46.4.248.192/27 +mp-members: 46.4.248.192/27 +mnt-by: DN42-MNT +source: DN42 diff --git a/data/route-set/RS-DN42-NATIVE b/data/route-set/RS-DN42-NATIVE index 0b3c51c9d..7d2bfecbf 100644 --- a/data/route-set/RS-DN42-NATIVE +++ b/data/route-set/RS-DN42-NATIVE @@ -3,6 +3,5 @@ descr: dn42 native networks mp-members: 172.20.0.0/14+ mp-members: fd00::/8+ members: 172.20.0.0/14+ -tech-c: DUMMY-DN42 -admin-c: DUMMY-DN42 -mnt-by: DUMMY-MNT +mnt-by: DN42-MNT +source: DN42 diff --git a/data/schema/AS-SET-SCHEMA b/data/schema/AS-SET-SCHEMA index 4baa88537..e4dcd9856 100644 --- a/data/schema/AS-SET-SCHEMA +++ b/data/schema/AS-SET-SCHEMA @@ -1,6 +1,6 @@ schema: AS-SET-SCHEMA ref: dn42.as-set -key: as-set required single primary schema +key: as-set required single primary schema key: descr optional single key: mnt-by required multiple lookup=dn42.mntner key: members optional multiple lookup=dn42.aut-num,dn42.as-set diff --git a/data/schema/DNS-SCHEMA b/data/schema/DNS-SCHEMA index bc23155ce..54422959e 100644 --- a/data/schema/DNS-SCHEMA +++ b/data/schema/DNS-SCHEMA @@ -1,6 +1,6 @@ schema: DNS-SCHEMA ref: dn42.domain -key: domain required single primary schema +key: domain required single primary schema key: nserver required multiple > [domain name] [ip addr] key: status required single > {EVALPEND,CONNECT} [timestamp] key: descr optional single diff --git a/data/schema/KEY-CERT-SCHEMA b/data/schema/KEY-CERT-SCHEMA new file mode 100644 index 000000000..efacac959 --- /dev/null +++ b/data/schema/KEY-CERT-SCHEMA @@ -0,0 +1,14 @@ +schema: KEY-CERT-SCHEMA +ref: dn42.key-cert +key: key-cert required single primary schema +key: method required single > {PGP|X509} +key: owner required multiple +key: fingerpr required single +key: certif required multiple +key: org optional multiple lookup=dn42.organisation +key: remarks optional multiple +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 +key: source required single +mnt-by: DN42-MNT diff --git a/data/schema/MNTNER-SCHEMA b/data/schema/MNTNER-SCHEMA index 08b629b4f..3590ec089 100644 --- a/data/schema/MNTNER-SCHEMA +++ b/data/schema/MNTNER-SCHEMA @@ -1,6 +1,6 @@ schema: MNTNER-SCHEMA ref: dn42.mntner -key: mntner required single primary schema +key: mntner required single primary schema key: descr optional single key: mnt-by required multiple lookup=dn42.mntner key: admin-c optional multiple lookup=dn42.person,dn42.role diff --git a/data/schema/SCHEMA-SCHEMA b/data/schema/SCHEMA-SCHEMA index 89e46f821..dcad662fc 100644 --- a/data/schema/SCHEMA-SCHEMA +++ b/data/schema/SCHEMA-SCHEMA @@ -1,6 +1,6 @@ schema: SCHEMA-SCHEMA ref: dn42.schema -key: schema required single schema primary > [name] +key: schema required single primary schema > [name] key: ref required single > [schema] key: key required multiple > [key-name] {required|optional|recommend|deprecate} diff --git a/data/schema/TINC-KEY-SCHEMA b/data/schema/TINC-KEY-SCHEMA index 705a8638e..e902fb693 100644 --- a/data/schema/TINC-KEY-SCHEMA +++ b/data/schema/TINC-KEY-SCHEMA @@ -1,6 +1,6 @@ schema: TINC-KEY-SCHEMA ref: dn42.tinc-key -key: tinc-key required single primary schema +key: tinc-key required single primary schema key: tinc-host required single key: tinc-file required single key: descr optional single diff --git a/data/schema/TINC-KEYSET-SCHEMA b/data/schema/TINC-KEYSET-SCHEMA index 566a9db64..9c0991288 100644 --- a/data/schema/TINC-KEYSET-SCHEMA +++ b/data/schema/TINC-KEYSET-SCHEMA @@ -1,6 +1,6 @@ schema: TINC-KEYSET-SCHEMA ref: dn42.tinc-keyset -key: tinc-keyset required single primary schema +key: tinc-keyset required single primary schema key: descr optional single key: remarks optional multiple key: member required multiple lookup=dn42.tinc-key