diff --git a/data/mntner/DN42-MNT b/data/mntner/DN42-MNT index 201f46dec..70f1876c7 100644 --- a/data/mntner/DN42-MNT +++ b/data/mntner/DN42-MNT @@ -1,6 +1,3 @@ mntner: DN42-MNT -descr: Shared maintainer object -sha512-pw: YzcyODMzZDZiYzAwZTc2ZDM5MjVmYWQ3YzhmYTI2ZjQxODBmZjJiYWNkZmUzNjQ4YTk0MjE2YjljMGVjNTk4ZjFkYjAxZWVkYzk2ZWQ1ZjEwYmI0OWZiYjdjMTRhYzZkZjg4ZGVmMzE3YWFmZGFiN2I5YTQzMjZhM2Q0MzA5ZDk1MGNhNDIxY2UxZmY4ODQ5ZmZlNWNiYmY1OWE4NTAxYWRhNjY2MmQ1ODhiOTdlYmVlYmQ3ZGJkMjExMzBmOGU5ZmUzMGQzYWJiZTUxMjJkNGQxNThmNmJhYjg4MGFhMmU2MDhkZDhhMmI0YTVhOGNiOTNjZGZlNThjYjA2ZWJjYTFhNGI4ZTNhYzQ5MTRiMDI2NGQ4ZThiZDUyMTYxOGEzOWE3YjgwNzljOTYzMWVkYjNiZThiOGUwMDVmOGY5YmQ4MjZkYzZlMTQxNGUwMmU1MTM0MTFkMTFlZTQ2ZGRkMDVjZWNlYjhiNjNhZTk0NDVhNWJkMjViNTEwNjI3MzIwMjhlNTkwZTUwNDQ3NmY4MmM0M2FkOTUyNTk1ODBjNDFlZWYxYTI2ZDBhNGQ3ZjhhNTllNmZmODQ2Yjk2ZWE0MDA1ODdmZGQ3YTMxYTI0N2JjNDg0YzgyMTAxOTBlMGU1YzliMWU2YzhkZjgzYjAwZjIzNDM0ZjU1NWM0Njc1MjM= -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 +descr: mntner for owning objects in the name of whole dn42. mnt-by: DN42-MNT diff --git a/data/organisation/ORG-DN42 b/data/organisation/ORG-DN42 index 7b65dc271..e7940429b 100644 --- a/data/organisation/ORG-DN42 +++ b/data/organisation/ORG-DN42 @@ -1,6 +1,3 @@ organisation: ORG-DN42 org-name: Decentralized network 42 -descr: Common organisation object -admin-c: DUMMY-DN42 -tech-c: DUMMY-DN42 mnt-by: DN42-MNT diff --git a/data/registry/CHAOSVPN b/data/registry/CHAOSVPN new file mode 100644 index 000000000..997c1441e --- /dev/null +++ b/data/registry/CHAOSVPN @@ -0,0 +1,4 @@ +registry: CHAOSVPN +url: https://wiki.hamburg.ccc.de/ChaosVPN:IPRanges +mnt-by: DN42-MNT +source: DN42 diff --git a/data/registry/DN42 b/data/registry/DN42 new file mode 100644 index 000000000..b3a598818 --- /dev/null +++ b/data/registry/DN42 @@ -0,0 +1,13 @@ +registry: DN42 +url: mtn://mtn.crest.dn42 +url: mtn://mtn.nixnodes.net +url: mtn://dn42.smrsh.net +url: mtn://mtn.xuu.dn42 +url: mtn://mtn.dn42.eu +url: mtn://mtn.grmml.dn42 +url: mtn://mtn.mhm.dn42 +url: mtn://mtn.lossy.network +url: mtn://mtn.evenet.dn42 +url: mtn://mtn.weiti.dn42 +mnt-by: DN42-MNT +source: DN42 diff --git a/data/registry/ICVPN b/data/registry/ICVPN new file mode 100644 index 000000000..72915282a --- /dev/null +++ b/data/registry/ICVPN @@ -0,0 +1,4 @@ +registry: ICVPN +url: https://github.com/freifunk/icvpn-meta.git +mnt-by: DN42-MNT +source: DN42 diff --git a/data/registry/RIPE b/data/registry/RIPE new file mode 100644 index 000000000..f2ec72235 --- /dev/null +++ b/data/registry/RIPE @@ -0,0 +1,4 @@ +registry: RIPE +url: whois://whois.ripe.net +mnt-by: DN42-MNT +source: DN42 diff --git a/data/schema/AS-BLOCK-SCHEMA b/data/schema/AS-BLOCK-SCHEMA index c870d6a56..6c85c1988 100644 --- a/data/schema/AS-BLOCK-SCHEMA +++ b/data/schema/AS-BLOCK-SCHEMA @@ -7,5 +7,5 @@ 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: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/AS-SET-SCHEMA b/data/schema/AS-SET-SCHEMA index cb88b778e..d7e962793 100644 --- a/data/schema/AS-SET-SCHEMA +++ b/data/schema/AS-SET-SCHEMA @@ -7,5 +7,5 @@ key: members optional multiple lookup=dn42.aut-num,dn42.as-s key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: remarks optional mutliple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/AUT-NUM-SCHEMA b/data/schema/AUT-NUM-SCHEMA index c972b138d..6825a18f4 100644 --- a/data/schema/AUT-NUM-SCHEMA +++ b/data/schema/AUT-NUM-SCHEMA @@ -18,5 +18,5 @@ key: mp-export optional multiple key: mp-default optional multiple key: geo-loc optional multiple > [lat-c] [long-c] [name] key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/DNS-SCHEMA b/data/schema/DNS-SCHEMA index 73c28db8c..0ad013d40 100644 --- a/data/schema/DNS-SCHEMA +++ b/data/schema/DNS-SCHEMA @@ -10,5 +10,5 @@ key: tech-c optional multiple lookup=dn42.person,dn42.role key: org optional multiple lookup=dn42.organisation key: country optional deprecate single key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/INET6NUM-SCHEMA b/data/schema/INET6NUM-SCHEMA index 965d5549a..5963eb186 100644 --- a/data/schema/INET6NUM-SCHEMA +++ b/data/schema/INET6NUM-SCHEMA @@ -18,5 +18,5 @@ key: mnt-lower optional multiple lookup=dn42.mntner key: mnt-routes optional multiple lookup=dn42.mntner key: org optional single lookup=dn42.organisation key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/INETNUM-SCHEMA b/data/schema/INETNUM-SCHEMA index f95f91897..8994d4f4a 100644 --- a/data/schema/INETNUM-SCHEMA +++ b/data/schema/INETNUM-SCHEMA @@ -18,5 +18,5 @@ key: mnt-lower optional multiple lookup=dn42.mntner key: mnt-routes optional multiple lookup=dn42.mntner key: org optional single lookup=dn42.organisation key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/MNTNER-SCHEMA b/data/schema/MNTNER-SCHEMA index cf08959cd..08b629b4f 100644 --- a/data/schema/MNTNER-SCHEMA +++ b/data/schema/MNTNER-SCHEMA @@ -10,5 +10,5 @@ key: org optional multiple lookup=dn42.organisation key: abuse-mailbox optional single key: sha512-pw optional single key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/ORGANISATION-SCHEMA b/data/schema/ORGANISATION-SCHEMA index f2f93cae9..a4c269e27 100644 --- a/data/schema/ORGANISATION-SCHEMA +++ b/data/schema/ORGANISATION-SCHEMA @@ -18,5 +18,5 @@ key: geoloc optional multiple key: language optional multiple key: remarks optional multiple key: address optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/PERSON-SCHEMA b/data/schema/PERSON-SCHEMA index d2e67f7d4..d86532229 100644 --- a/data/schema/PERSON-SCHEMA +++ b/data/schema/PERSON-SCHEMA @@ -16,5 +16,5 @@ key: phone optional multiple key: fax-no optional multiple key: address optional multiple key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/REGISTRY-SCHEMA b/data/schema/REGISTRY-SCHEMA new file mode 100644 index 000000000..26a0ac2e8 --- /dev/null +++ b/data/schema/REGISTRY-SCHEMA @@ -0,0 +1,10 @@ +schema: REGISTRY-SCHEMA +ref: dn42.registry +key: registry required single primary schema +key: url required multiple +key: descr optional multiple +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 +mnt-by: DN42-MNT diff --git a/data/schema/ROLE-SCHEMA b/data/schema/ROLE-SCHEMA index 14021a142..ce20572a3 100644 --- a/data/schema/ROLE-SCHEMA +++ b/data/schema/ROLE-SCHEMA @@ -10,5 +10,5 @@ key: abuse-c optional multiple lookup=dn42.person key: abuse-mailbox optional multiple key: descr optional single key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/ROUTE-SCHEMA b/data/schema/ROUTE-SCHEMA index 4ef521f2f..1024dfe62 100644 --- a/data/schema/ROUTE-SCHEMA +++ b/data/schema/ROUTE-SCHEMA @@ -9,5 +9,5 @@ key: tech-c optional multiple lookup=dn42.person,dn42.role key: inet-cidr optional single lookup=dn42.inetnum key: descr optional single key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/ROUTE-SET-SCHEMA b/data/schema/ROUTE-SET-SCHEMA index 0dc289d55..7f6c81faf 100644 --- a/data/schema/ROUTE-SET-SCHEMA +++ b/data/schema/ROUTE-SET-SCHEMA @@ -9,5 +9,5 @@ key: mbrs-by-ref optional multiple lookup=dn42.route key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/ROUTE6-SCHEMA b/data/schema/ROUTE6-SCHEMA index cf63b2018..66a68b86d 100644 --- a/data/schema/ROUTE6-SCHEMA +++ b/data/schema/ROUTE6-SCHEMA @@ -8,5 +8,5 @@ key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: descr optional multiple key: remarks optional multiple -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/SCHEMA-SCHEMA b/data/schema/SCHEMA-SCHEMA index 0a96213d9..7f70e034e 100644 --- a/data/schema/SCHEMA-SCHEMA +++ b/data/schema/SCHEMA-SCHEMA @@ -8,8 +8,7 @@ key: key required multiple > [key-name] lookup=str '>' [spec]... key: mnt-by required multiple lookup=dn42.mntner > [mntner] key: remarks optional multiple > [text]... -mnt-by: XUU-MNT -mnt-by: HEXA-MNT +mnt-by: DN42-MNT remarks: # option descriptions required : object required to have at least one diff --git a/data/schema/TINC-KEY-SCHEMA b/data/schema/TINC-KEY-SCHEMA index 8fe712b69..705a8638e 100644 --- a/data/schema/TINC-KEY-SCHEMA +++ b/data/schema/TINC-KEY-SCHEMA @@ -12,5 +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 +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/data/schema/TINC-KEYSET-SCHEMA b/data/schema/TINC-KEYSET-SCHEMA index 049bbf7f6..566a9db64 100644 --- a/data/schema/TINC-KEYSET-SCHEMA +++ b/data/schema/TINC-KEYSET-SCHEMA @@ -7,5 +7,5 @@ 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 +key: source required single lookup=dn42.registry +mnt-by: DN42-MNT diff --git a/utils/schema-check/dn42-schema.py b/utils/schema-check/dn42-schema.py index 1df1108be..1fe098294 100755 --- a/utils/schema-check/dn42-schema.py +++ b/utils/schema-check/dn42-schema.py @@ -341,6 +341,7 @@ def __index_files(path, use_file): "role/": SCHEMA_NAMESPACE + "role", "tinc-key/": SCHEMA_NAMESPACE + "tinc-key", "tinc-keyset/": SCHEMA_NAMESPACE + "tinc-keyset", + "registry/": SCHEMA_NAMESPACE + "registry", "schema/": SCHEMA_NAMESPACE + "schema", } @@ -600,7 +601,7 @@ def test_policy(obj_type, name, mntner): mask = "%03d" %(mask) log.info([Lnet, Hnet, mask]) - lis = find(["inetnum","inet6num","policy","@netlevel","mnt-by","mnt-lower"], + lis = find(["inetnum","inet6num","policy","@netlevel","mnt-by","mnt-lower"], {"@type": "net", "@netmin": "le=" + Lnet, "@netmax": "ge=" + Hnet, "@netmask": "le=" + mask}) log.debug(lis)