From 577726434cd103b29893cd897966316c55aa4184 Mon Sep 17 00:00:00 2001 From: Xuu Date: Sun, 31 Dec 2017 06:01:03 +0000 Subject: [PATCH] merging registry into git --- data/inet6num/fd06:e881:1300::_44 | 2 +- data/inet6num/fd51:cc31:30f5::_48 | 2 +- data/inet6num/fdca:852a:928d::_48 | 2 +- data/inet6num/fdfd:dead:c0de::_48 | 2 +- data/inetnum/172.20.226.0_24 | 2 +- data/inetnum/172.23.169.0_24 | 2 +- data/inetnum/172.23.179.0_24 | 2 +- data/route/172.20.140.0_23 | 4 ++++ utils/schema-check/dn42-schema.py | 8 ++++++-- 9 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 data/route/172.20.140.0_23 diff --git a/data/inet6num/fd06:e881:1300::_44 b/data/inet6num/fd06:e881:1300::_44 index edb4e33ce..9c999b234 100644 --- a/data/inet6num/fd06:e881:1300::_44 +++ b/data/inet6num/fd06:e881:1300::_44 @@ -1,4 +1,4 @@ -inet6num: fd06:e881:1300:0000:0000:0000:0000:0000-fd06:e881:130f:ffff:ffff:ffff:ffff:ffff +inet6num: fd06:e881:1300:0000:0000:0000:0000:0000 - fd06:e881:130f:ffff:ffff:ffff:ffff:ffff netname: NET-REWBYSOFT-VMCLUSTER nserver: ns1.aperture-laboratories.dn42 country: NL diff --git a/data/inet6num/fd51:cc31:30f5::_48 b/data/inet6num/fd51:cc31:30f5::_48 index a96abdfe2..0f135a086 100644 --- a/data/inet6num/fd51:cc31:30f5::_48 +++ b/data/inet6num/fd51:cc31:30f5::_48 @@ -1,4 +1,4 @@ -inet6num: fd51:cc31:30f5:0000:0000:0000:0000:0000-fd51:cc31:30f5:ffff:ffff:ffff:ffff:ffff +inet6num: fd51:cc31:30f5:0000:0000:0000:0000:0000 - fd51:cc31:30f5:ffff:ffff:ffff:ffff:ffff netname: NET-REWBYSOFT-000 country: NL admin-c: REWBYCRAFT-DN42 diff --git a/data/inet6num/fdca:852a:928d::_48 b/data/inet6num/fdca:852a:928d::_48 index 600da4100..e6073cf2a 100644 --- a/data/inet6num/fdca:852a:928d::_48 +++ b/data/inet6num/fdca:852a:928d::_48 @@ -1,4 +1,4 @@ -inet6num: fdca:852a:928d:0000:0000:0000:0000:0000-fdca:852a:928d:ffff:ffff:ffff:ffff:ffff +inet6num: fdca:852a:928d:0000:0000:0000:0000:0000 - fdca:852a:928d:ffff:ffff:ffff:ffff:ffff netname: NET-REWBYSOFT-001 remarks: This prefix will be decomissioned shortly. country: NL diff --git a/data/inet6num/fdfd:dead:c0de::_48 b/data/inet6num/fdfd:dead:c0de::_48 index e90a29d15..0b43944cf 100644 --- a/data/inet6num/fdfd:dead:c0de::_48 +++ b/data/inet6num/fdfd:dead:c0de::_48 @@ -1,4 +1,4 @@ -inet6num: fdfd:dead:c0de:0000:0000:0000:0000:0000-fdfd:dead:c0de:ffff:ffff:ffff:ffff:ffff +inet6num: fdfd:dead:c0de:0000:0000:0000:0000:0000 - fdfd:dead:c0de:ffff:ffff:ffff:ffff:ffff netname: NET-REWBYSOFT nserver: ns1.aperture-laboratories.dn42 descr: Main allocation. diff --git a/data/inetnum/172.20.226.0_24 b/data/inetnum/172.20.226.0_24 index b6a436b87..493c46c13 100644 --- a/data/inetnum/172.20.226.0_24 +++ b/data/inetnum/172.20.226.0_24 @@ -1,4 +1,4 @@ -inetnum: 172.20.226.0-172.20.226.255 +inetnum: 172.20.226.0 - 172.20.226.255 netname: NET-REWBYSOFT-VMCLUSTER nserver: ns1.aperture-laboratories.dn42 descr: Secondary allocation. Used by VM cluster. diff --git a/data/inetnum/172.23.169.0_24 b/data/inetnum/172.23.169.0_24 index 1e0b2b74d..a7399fb32 100644 --- a/data/inetnum/172.23.169.0_24 +++ b/data/inetnum/172.23.169.0_24 @@ -1,4 +1,4 @@ -inetnum: 172.23.169.0-172.23.169.255 +inetnum: 172.23.169.0 - 172.23.169.255 netname: NET-REWBYSOFT-ASIX nserver: ns1.aperture-laboratories.dn42 descr: ASIX Network diff --git a/data/inetnum/172.23.179.0_24 b/data/inetnum/172.23.179.0_24 index fe968c9ea..fb82a80a0 100644 --- a/data/inetnum/172.23.179.0_24 +++ b/data/inetnum/172.23.179.0_24 @@ -1,4 +1,4 @@ -inetnum: 172.23.179.0-172.23.179.255 +inetnum: 172.23.179.0 - 172.23.179.255 netname: ASIX-2 descr: Second allocation for asix (because it ran out) admin-c: REWBYCRAFT-DN42 diff --git a/data/route/172.20.140.0_23 b/data/route/172.20.140.0_23 new file mode 100644 index 000000000..ea9116d90 --- /dev/null +++ b/data/route/172.20.140.0_23 @@ -0,0 +1,4 @@ +route: 172.20.140.0/23 +origin: AS4242420842 +mnt-by: REWBYSOFT-MNT +bgp-status: active diff --git a/utils/schema-check/dn42-schema.py b/utils/schema-check/dn42-schema.py index b6e9b2a34..3c3ff12dc 100755 --- a/utils/schema-check/dn42-schema.py +++ b/utils/schema-check/dn42-schema.py @@ -181,7 +181,7 @@ class FileDOM: if i[0].strip() not in keys: keys[i[0].strip()] = [] - keys[i[0].strip()].append(lineno - 1) + keys[i[0].strip()].append(len(dom) - 1) last_multi = None @@ -213,8 +213,9 @@ class FileDOM: def get(self, key, index=0, default=None): if key not in self.keys: return default - if index > len(self.keys[key]) or index < -len(self.keys[key]): + if index >= len(self.keys[key]) or index <= -len(self.keys[key]): return default + return self.dom[self.keys[key][index]][1] @@ -741,6 +742,8 @@ def test_policy(obj_type, name, mntner): return "FAIL" def sanity_check(dom): +# log.info(dom.keys) +# log.info(dom.dom) ck = "PASS" if dom.schema == "dn42.inetnum": cidr = dom.get("cidr") @@ -755,6 +758,7 @@ def sanity_check(dom): if dom.schema == "dn42.inet6num": cidr = dom.get("cidr") + log.info(cidr) Lnet, Hnet, mask = inet6range(cidr) cidr_range = pretty_ip(Lnet) + "-" + pretty_ip(Hnet) file_range = dom.get("inet6num")