From f52df83fbee2a58f097614dbce7b25bded733507 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Wed, 14 Feb 2018 21:50:02 +0100 Subject: [PATCH] Fix format violations and directory name vs schema key key mismatches --- data/as-block/AS1-AS4294967294 | 2 +- data/as-block/AS4242420000-AS4242423999 | 2 +- data/as-block/AS4242424000-AS4242426999 | 2 +- data/as-block/AS4242427000-AS4242429999 | 2 +- data/as-block/AS64512-AS65534 | 2 +- data/as-block/AS64600-AS64855 | 2 +- data/as-block/AS64856-AS64999 | 2 +- data/as-block/AS76100-AS76199 | 2 +- data/aut-num/AS4242423794 | 2 +- data/inet6num/::_0 | 4 ++-- data/route6/fd88:8888:abcd::_48 | 2 +- data/route6/fdc0:ffee::_48 | 2 +- data/route6/fdc3:c927:1455::_48 | 2 +- data/route6/fdc7:3c9d:b889:a272::_64 | 2 +- data/route6/fdc7:3c9d:ff31::_48 | 2 +- data/route6/fdc7:5384:30::_48 | 2 +- data/schema/SCHEMA-SCHEMA | 18 +++++++++--------- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/as-block/AS1-AS4294967294 b/data/as-block/AS1-AS4294967294 index 83324aad8..d9d7fafb1 100644 --- a/data/as-block/AS1-AS4294967294 +++ b/data/as-block/AS1-AS4294967294 @@ -1,4 +1,4 @@ -as-block: AS1 - AS4294967294 +as-block: AS1-AS4294967294 descr: Root AS-BLOCK remarks: This block is reserved to delegate access for sub-allocations. remarks: You can not freely register any ASN in this block. diff --git a/data/as-block/AS4242420000-AS4242423999 b/data/as-block/AS4242420000-AS4242423999 index f963fedc1..94b826a66 100644 --- a/data/as-block/AS4242420000-AS4242423999 +++ b/data/as-block/AS4242420000-AS4242423999 @@ -1,4 +1,4 @@ -as-block: AS4242420000 - AS4242423999 +as-block: AS4242420000-AS4242423999 descr: dn42 ASN space for end-users remarks: This block is reserved for end-users allocation. remarks: You can freely register any ASN in this block. diff --git a/data/as-block/AS4242424000-AS4242426999 b/data/as-block/AS4242424000-AS4242426999 index 26e0d3ebb..6d1b8c7fd 100644 --- a/data/as-block/AS4242424000-AS4242426999 +++ b/data/as-block/AS4242424000-AS4242426999 @@ -1,4 +1,4 @@ -as-block: AS4242424000 - AS4242426999 +as-block: AS4242424000-AS4242426999 descr: Future dn42 use remarks: This block is reserved for future dn42 use. mnt-by: DUMMY-MNT diff --git a/data/as-block/AS4242427000-AS4242429999 b/data/as-block/AS4242427000-AS4242429999 index a0716be19..94903c351 100644 --- a/data/as-block/AS4242427000-AS4242429999 +++ b/data/as-block/AS4242427000-AS4242429999 @@ -1,4 +1,4 @@ -as-block: AS4242427000 - AS4242429999 +as-block: AS4242427000-AS4242429999 descr: dn42 ASN space for sub-allocations remarks: This block is reserved for sub-allocations. remarks: Please don't allocate individual ASN directly in this block. diff --git a/data/as-block/AS64512-AS65534 b/data/as-block/AS64512-AS65534 index e4c81674b..e8bae02df 100644 --- a/data/as-block/AS64512-AS65534 +++ b/data/as-block/AS64512-AS65534 @@ -1,4 +1,4 @@ -as-block: AS64512 - AS65534 +as-block: AS64512-AS65534 descr: Private ASN block mnt-by: DUMMY-MNT policy: closed diff --git a/data/as-block/AS64600-AS64855 b/data/as-block/AS64600-AS64855 index ae6f417a0..262ab6c61 100644 --- a/data/as-block/AS64600-AS64855 +++ b/data/as-block/AS64600-AS64855 @@ -1,4 +1,4 @@ -as-block: AS64600 - AS64855 +as-block: AS64600-AS64855 descr: dn42 native ASN block (legacy) remarks: The legacy policy was that if you own 172.22.x.0/24 you own the ASN 64600+x. remarks: With the default allocation policy of an /25 per person now this becomes a problem. diff --git a/data/as-block/AS64856-AS64999 b/data/as-block/AS64856-AS64999 index d2348afa7..39dcd7a4b 100644 --- a/data/as-block/AS64856-AS64999 +++ b/data/as-block/AS64856-AS64999 @@ -1,4 +1,4 @@ -as-block: AS64856 - AS64999 +as-block: AS64856-AS64999 descr: dn42 native ASN block (legacy) remarks: this block was allocated to encourage people to use the private AS range reserved remarks: by IANA instead of the 76100-76199 block. diff --git a/data/as-block/AS76100-AS76199 b/data/as-block/AS76100-AS76199 index 1d8cc0c6e..999bef7ab 100644 --- a/data/as-block/AS76100-AS76199 +++ b/data/as-block/AS76100-AS76199 @@ -1,4 +1,4 @@ -as-block: AS76100 - AS76199 +as-block: AS76100-AS76199 descr: Legacy dn42 ASN block remarks: This range was never intented to be used as private ASN remarks: space by IANA. Rather, it is part of a larger block of diff --git a/data/aut-num/AS4242423794 b/data/aut-num/AS4242423794 index 12d51b1e8..3ffad6aa4 100644 --- a/data/aut-num/AS4242423794 +++ b/data/aut-num/AS4242423794 @@ -1,4 +1,4 @@ -aut-num: 4242423794 +aut-num: AS4242423794 as-name: MATTCODE admin-c: MATTCODE-DN42 tech-c: MATTCODE-DN42 diff --git a/data/inet6num/::_0 b/data/inet6num/::_0 index 5047f5cd4..a7a5a7742 100644 --- a/data/inet6num/::_0 +++ b/data/inet6num/::_0 @@ -2,10 +2,10 @@ inet6num: 0000:0000:0000:0000:0000:0000:0000:0000 - ffff:ffff:ffff:fff netname: IANA-RESERVED descr: IANA Reserved Space remarks: This space is reserved by RFC4291. -remarks: +remarks: remarks: Because portions are not routable inside dn42 remarks: reservations are not allowed at this level. -remarks: +remarks: remarks: Open policy can be found inside fd00::/8 admin-c: DUMMY-DN42 tech-c: DUMMY-DN42 diff --git a/data/route6/fd88:8888:abcd::_48 b/data/route6/fd88:8888:abcd::_48 index 53d75af74..584f21cab 100644 --- a/data/route6/fd88:8888:abcd::_48 +++ b/data/route6/fd88:8888:abcd::_48 @@ -1,4 +1,4 @@ -route: fd88:8888:abcd::/48 +route6: fd88:8888:abcd::/48 origin: AS4242420448 mnt-by: FRYGUY-MNT source: DN42 diff --git a/data/route6/fdc0:ffee::_48 b/data/route6/fdc0:ffee::_48 index 7ddde9c2a..18b31729a 100644 --- a/data/route6/fdc0:ffee::_48 +++ b/data/route6/fdc0:ffee::_48 @@ -1,4 +1,4 @@ -route: fdc0:ffee::/48 +route6: fdc0:ffee::/48 origin: AS4242422030 mnt-by: MUTE-MNT source: DN42 diff --git a/data/route6/fdc3:c927:1455::_48 b/data/route6/fdc3:c927:1455::_48 index 01c522c33..e996031cd 100644 --- a/data/route6/fdc3:c927:1455::_48 +++ b/data/route6/fdc3:c927:1455::_48 @@ -1,4 +1,4 @@ -route: fdc3:c927:1455::/48 +route6: fdc3:c927:1455::/48 origin: AS4242422499 mnt-by: MULTI-MNT source: DN42 diff --git a/data/route6/fdc7:3c9d:b889:a272::_64 b/data/route6/fdc7:3c9d:b889:a272::_64 index 399c18217..43b7b5552 100644 --- a/data/route6/fdc7:3c9d:b889:a272::_64 +++ b/data/route6/fdc7:3c9d:b889:a272::_64 @@ -1,4 +1,4 @@ -route: fdc7:3c9d:b889:a272::/64 +route6: fdc7:3c9d:b889:a272::/64 origin: AS65043 mnt-by: FF3L-MNT mnt-by: KPANIC-MNT diff --git a/data/route6/fdc7:3c9d:ff31::_48 b/data/route6/fdc7:3c9d:ff31::_48 index 464177295..2266a36bb 100644 --- a/data/route6/fdc7:3c9d:ff31::_48 +++ b/data/route6/fdc7:3c9d:ff31::_48 @@ -1,4 +1,4 @@ -route: fdc7:3c9d:ff31::/48 +route6: fdc7:3c9d:ff31::/48 origin: AS65043 mnt-by: FF3L-MNT mnt-by: KPANIC-MNT diff --git a/data/route6/fdc7:5384:30::_48 b/data/route6/fdc7:5384:30::_48 index 8f88b960e..c6842a59e 100644 --- a/data/route6/fdc7:5384:30::_48 +++ b/data/route6/fdc7:5384:30::_48 @@ -1,4 +1,4 @@ -route: fdc7:5384:30::/48 +route6: fdc7:5384:30::/48 origin: AS65043 mnt-by: FF3L-MNT mnt-by: KPANIC-MNT diff --git a/data/schema/SCHEMA-SCHEMA b/data/schema/SCHEMA-SCHEMA index 7f70e034e..8f115167a 100644 --- a/data/schema/SCHEMA-SCHEMA +++ b/data/schema/SCHEMA-SCHEMA @@ -14,36 +14,36 @@ remarks: # option descriptions : object required to have at least one optional : object not required to have at least one - ++ single : only one of this type allowed multiple : more than one of this type allowed - ++ primary : use field as lookup key for lookup * only one allowed per schema * does not allow newlines - ++ schema : use field name as the name of the schema * only one allowed per schema * does not allow newlines - ++ lookup : schema match to use for related record - ++ \> option specs : defines the option specifications for the key. * must come last in option list - ++ [label] string value. A positional string argument required. Text inside brackets represent a label for the string. If follwed by '...' values are gathered as an array. - ++ {enum1|enum2|} enumeration. One option in pipe('|') deliniation is allowed. If there is a trailing pipe it means the enum is optional. - ++ label=str keyword argument. Label for value with type 'str', 'int', or 'decimal' - ++ 'literal' Literal value. literal text value.