Browse Source

Add source attribute

jrb0001 2 years ago
parent
commit
c05617688e

File diff suppressed because it is too large
+ 1 - 4
data/mntner/DN42-MNT


+ 0 - 3
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

+ 4 - 0
data/registry/CHAOSVPN

@@ -0,0 +1,4 @@
+registry:           CHAOSVPN
+url:                https://wiki.hamburg.ccc.de/ChaosVPN:IPRanges
+mnt-by:             DN42-MNT
+source:             DN42

+ 13 - 0
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

+ 4 - 0
data/registry/ICVPN

@@ -0,0 +1,4 @@
+registry:           ICVPN
+url:                https://github.com/freifunk/icvpn-meta.git
+mnt-by:             DN42-MNT
+source:             DN42

+ 4 - 0
data/registry/RIPE

@@ -0,0 +1,4 @@
+registry:           RIPE
+url:                whois://whois.ripe.net
+mnt-by:             DN42-MNT
+source:             DN42

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 10 - 0
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 1 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 1
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)