From 56c66478b89887cb06a1f6b22e1b1194ac3ab237 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Thu, 30 Nov 2017 21:11:22 +0100 Subject: [PATCH 1/2] Remove unneeded objects and prepare for new infrastructure --- data/aut-num/AS4242420119 | 4 ++-- data/dns/as4242420118.dn42 | 7 ------- data/dns/as4242420119.dn42 | 7 ------- data/inet6num/fd42:5d71:219:1001::_64 | 7 ------- data/inet6num/fd42:5d71:219:1002::_64 | 7 ------- data/inet6num/fd42:5d71:219:1003::_64 | 7 ------- data/inet6num/fd42:5d71:219:1::_64 | 8 -------- data/inet6num/fd42:5d71:219:2::_64 | 8 -------- data/inet6num/fd42:5d71:219::_48 | 6 +++--- data/inetnum/172.20.14.32_27 | 6 +++--- data/inetnum/172.20.14.32_28 | 8 -------- data/inetnum/172.20.14.48_28 | 8 -------- data/inetnum/172.21.100.16_28 | 8 -------- data/inetnum/172.21.64.112_29 | 9 --------- data/inetnum/172.21.64.120_29 | 8 -------- data/inetnum/172.21.64.96_29 | 9 --------- data/route/172.20.14.32_28 | 5 ----- data/route/172.20.14.48_28 | 5 ----- data/route/172.21.100.16_28 | 5 ----- data/route/172.21.64.112_29 | 5 ----- data/route/172.21.64.120_29 | 5 ----- data/route/172.21.64.96_29 | 5 ----- data/route6/fd42:5d71:219:1001::_64 | 4 ---- data/route6/fd42:5d71:219:1002::_64 | 4 ---- data/route6/fd42:5d71:219:1003::_64 | 4 ---- data/route6/fd42:5d71:219:1::_64 | 4 ---- data/route6/fd42:5d71:219:2::_64 | 4 ---- 27 files changed, 8 insertions(+), 159 deletions(-) delete mode 100644 data/dns/as4242420118.dn42 delete mode 100644 data/dns/as4242420119.dn42 delete mode 100644 data/inet6num/fd42:5d71:219:1001::_64 delete mode 100644 data/inet6num/fd42:5d71:219:1002::_64 delete mode 100644 data/inet6num/fd42:5d71:219:1003::_64 delete mode 100644 data/inet6num/fd42:5d71:219:1::_64 delete mode 100644 data/inet6num/fd42:5d71:219:2::_64 delete mode 100644 data/inetnum/172.20.14.32_28 delete mode 100644 data/inetnum/172.20.14.48_28 delete mode 100644 data/inetnum/172.21.100.16_28 delete mode 100644 data/inetnum/172.21.64.112_29 delete mode 100644 data/inetnum/172.21.64.120_29 delete mode 100644 data/inetnum/172.21.64.96_29 delete mode 100644 data/route/172.20.14.32_28 delete mode 100644 data/route/172.20.14.48_28 delete mode 100644 data/route/172.21.100.16_28 delete mode 100644 data/route/172.21.64.112_29 delete mode 100644 data/route/172.21.64.120_29 delete mode 100644 data/route/172.21.64.96_29 delete mode 100644 data/route6/fd42:5d71:219:1001::_64 delete mode 100644 data/route6/fd42:5d71:219:1002::_64 delete mode 100644 data/route6/fd42:5d71:219:1003::_64 delete mode 100644 data/route6/fd42:5d71:219:1::_64 delete mode 100644 data/route6/fd42:5d71:219:2::_64 diff --git a/data/aut-num/AS4242420119 b/data/aut-num/AS4242420119 index 22617e8b3..74e707e4a 100644 --- a/data/aut-num/AS4242420119 +++ b/data/aut-num/AS4242420119 @@ -1,6 +1,6 @@ aut-num: AS4242420119 -as-name: JRB0001-SERVICES +as-name: JRB0001 admin-c: JRB0001-DN42 tech-c: JRB0001-DN42 mnt-by: JRB0001-MNT -remarks: Please peer with AS4242420118 instead. This AS is used by services only. +remarks: This AS will be used for the new infrastructure which is still WIP. diff --git a/data/dns/as4242420118.dn42 b/data/dns/as4242420118.dn42 deleted file mode 100644 index b30165814..000000000 --- a/data/dns/as4242420118.dn42 +++ /dev/null @@ -1,7 +0,0 @@ -domain: as4242420118.dn42 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -nserver: ns.as4242420119.dn42 -nserver: ns.as4242420119.dn42 -status: EVALPEND 1503915576 diff --git a/data/dns/as4242420119.dn42 b/data/dns/as4242420119.dn42 deleted file mode 100644 index ff695c47f..000000000 --- a/data/dns/as4242420119.dn42 +++ /dev/null @@ -1,7 +0,0 @@ -domain: as4242420119.dn42 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -nserver: ns.as4242420119.dn42 172.21.64.97 -nserver: ns.as4242420119.dn42 fd42:5d71:219:1::1 -status: EVALPEND 1503915606 diff --git a/data/inet6num/fd42:5d71:219:1001::_64 b/data/inet6num/fd42:5d71:219:1001::_64 deleted file mode 100644 index f9e93a858..000000000 --- a/data/inet6num/fd42:5d71:219:1001::_64 +++ /dev/null @@ -1,7 +0,0 @@ -inet6num: fd42:5d71:219:1001::-fd42:5d71:219:1001:FFFF:FFFF:FFFF:FFFF -netname: JRB0001-SERVICES-DE-1 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED -cidr: fd42:5d71:219:1001::/64 diff --git a/data/inet6num/fd42:5d71:219:1002::_64 b/data/inet6num/fd42:5d71:219:1002::_64 deleted file mode 100644 index 11974b7b8..000000000 --- a/data/inet6num/fd42:5d71:219:1002::_64 +++ /dev/null @@ -1,7 +0,0 @@ -inet6num: fd42:5d71:219:1002::-fd42:5d71:219:1002:FFFF:FFFF:FFFF:FFFF -netname: JRB0001-SERVICES-FR-1 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED -cidr: fd42:5d71:219:1002::/64 diff --git a/data/inet6num/fd42:5d71:219:1003::_64 b/data/inet6num/fd42:5d71:219:1003::_64 deleted file mode 100644 index 70e3ace59..000000000 --- a/data/inet6num/fd42:5d71:219:1003::_64 +++ /dev/null @@ -1,7 +0,0 @@ -inet6num: fd42:5d71:219:1003::-fd42:5d71:219:1003:FFFF:FFFF:FFFF:FFFF -netname: JRB0001-SERVICES-NL-1 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED -cidr: fd42:5d71:219:1003::/64 diff --git a/data/inet6num/fd42:5d71:219:1::_64 b/data/inet6num/fd42:5d71:219:1::_64 deleted file mode 100644 index e15e13999..000000000 --- a/data/inet6num/fd42:5d71:219:1::_64 +++ /dev/null @@ -1,8 +0,0 @@ -inet6num: fd42:5d71:219:1::-fd42:5d71:219:1:FFFF:FFFF:FFFF:FFFF -netname: JRB0001-SERVICES-ANYCAST -descr: DNS -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED PI -cidr: fd42:5d71:219:1::/64 diff --git a/data/inet6num/fd42:5d71:219:2::_64 b/data/inet6num/fd42:5d71:219:2::_64 deleted file mode 100644 index 73c2739f0..000000000 --- a/data/inet6num/fd42:5d71:219:2::_64 +++ /dev/null @@ -1,8 +0,0 @@ -inet6num: fd42:5d71:219:2::-fd42:5d71:219:2:FFFF:FFFF:FFFF:FFFF -netname: JRB0001-SERVICES-ANYCAST -descr: HTTP -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED PI -cidr: fd42:5d71:219:2::/64 diff --git a/data/inet6num/fd42:5d71:219::_48 b/data/inet6num/fd42:5d71:219::_48 index 8a211b854..2ef481349 100644 --- a/data/inet6num/fd42:5d71:219::_48 +++ b/data/inet6num/fd42:5d71:219::_48 @@ -1,7 +1,7 @@ inet6num: fd42:5d71:219::-fd42:5d71:219:FFFF:FFFF:FFFF:FFFF:FFFF -netname: JRB0001-SERVICES +netname: JRB0001 admin-c: JRB0001-DN42 tech-c: JRB0001-DN42 mnt-by: JRB0001-MNT -status: ALLOCATED PI -cidr: fd42:5d71:219::/48 +status: ALLOCATED PA +cidr: fd42:5d71:219::/48 diff --git a/data/inetnum/172.20.14.32_27 b/data/inetnum/172.20.14.32_27 index 1530e4784..d792661a1 100644 --- a/data/inetnum/172.20.14.32_27 +++ b/data/inetnum/172.20.14.32_27 @@ -1,8 +1,8 @@ inetnum: 172.20.14.32-172.20.14.63 -netname: JRB0001-SERVICES +netname: JRB0001 admin-c: JRB0001-DN42 tech-c: JRB0001-DN42 mnt-by: JRB0001-MNT -status: ALLOCATED +status: ALLOCATED PA bgp-status: active -cidr: 172.20.14.32/27 +cidr: 172.20.14.32/27 diff --git a/data/inetnum/172.20.14.32_28 b/data/inetnum/172.20.14.32_28 deleted file mode 100644 index 0b36c31d0..000000000 --- a/data/inetnum/172.20.14.32_28 +++ /dev/null @@ -1,8 +0,0 @@ -inetnum: 172.20.14.32-172.20.14.47 -netname: JRB0001-SERVICES-DE-1 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED -bgp-status: active -cidr: 172.20.14.32/28 diff --git a/data/inetnum/172.20.14.48_28 b/data/inetnum/172.20.14.48_28 deleted file mode 100644 index 3d80fe64b..000000000 --- a/data/inetnum/172.20.14.48_28 +++ /dev/null @@ -1,8 +0,0 @@ -inetnum: 172.20.14.48-172.20.14.63 -netname: JRB0001-SERVICES-FR-1 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED -bgp-status: active -cidr: 172.20.14.48/28 diff --git a/data/inetnum/172.21.100.16_28 b/data/inetnum/172.21.100.16_28 deleted file mode 100644 index 24cf5c07a..000000000 --- a/data/inetnum/172.21.100.16_28 +++ /dev/null @@ -1,8 +0,0 @@ -inetnum: 172.21.100.16-172.21.100.31 -netname: JRB0001-SERVICES-NL-1 -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED -bgp-status: inactive 1503619204 -cidr: 172.21.100.16/28 diff --git a/data/inetnum/172.21.64.112_29 b/data/inetnum/172.21.64.112_29 deleted file mode 100644 index 5253da0f5..000000000 --- a/data/inetnum/172.21.64.112_29 +++ /dev/null @@ -1,9 +0,0 @@ -inetnum: 172.21.64.112-172.21.64.119 -netname: JRB0001-SERVICES-ANYCAST -descr: HTTP -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED PI -bgp-status: inactive 1497672004 -cidr: 172.21.64.112/29 diff --git a/data/inetnum/172.21.64.120_29 b/data/inetnum/172.21.64.120_29 deleted file mode 100644 index 865f6529a..000000000 --- a/data/inetnum/172.21.64.120_29 +++ /dev/null @@ -1,8 +0,0 @@ -inetnum: 172.21.64.120-172.21.64.127 -netname: JRB0001-SERVICES-ANYCAST -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ALLOCATED PI -bgp-status: inactive 1497672004 -cidr: 172.21.64.120/29 diff --git a/data/inetnum/172.21.64.96_29 b/data/inetnum/172.21.64.96_29 deleted file mode 100644 index 0971b7726..000000000 --- a/data/inetnum/172.21.64.96_29 +++ /dev/null @@ -1,9 +0,0 @@ -inetnum: 172.21.64.96-172.21.64.103 -netname: JRB0001-SERVICES-ANYCAST -descr: DNS -admin-c: JRB0001-DN42 -tech-c: JRB0001-DN42 -mnt-by: JRB0001-MNT -status: ASSIGNED PI -bgp-status: active -cidr: 172.21.64.96/29 diff --git a/data/route/172.20.14.32_28 b/data/route/172.20.14.32_28 deleted file mode 100644 index 4c4fa74db..000000000 --- a/data/route/172.20.14.32_28 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.20.14.32/28 -descr: JRB0001-SERVICES-DE-1 -origin: AS4242420118 -mnt-by: JRB0001-MNT -bgp-status: active diff --git a/data/route/172.20.14.48_28 b/data/route/172.20.14.48_28 deleted file mode 100644 index 39d1a5ce7..000000000 --- a/data/route/172.20.14.48_28 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.20.14.48/28 -descr: JRB0001-SERVICES-FR-1 -origin: AS4242420118 -mnt-by: JRB0001-MNT -bgp-status: active diff --git a/data/route/172.21.100.16_28 b/data/route/172.21.100.16_28 deleted file mode 100644 index e32433140..000000000 --- a/data/route/172.21.100.16_28 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.21.100.16/28 -descr: JRB0001-SERVICES-NL-1 -origin: AS4242420118 -mnt-by: JRB0001-MNT -bgp-status: inactive 1503619207 diff --git a/data/route/172.21.64.112_29 b/data/route/172.21.64.112_29 deleted file mode 100644 index 872e34983..000000000 --- a/data/route/172.21.64.112_29 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.21.64.112/29 -descr: JRB0001-SERVICES-ANYCAST -origin: AS4242420119 -mnt-by: JRB0001-MNT -bgp-status: inactive 1499875220 diff --git a/data/route/172.21.64.120_29 b/data/route/172.21.64.120_29 deleted file mode 100644 index 5e1979823..000000000 --- a/data/route/172.21.64.120_29 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.21.64.120/29 -descr: JRB0001-SERVICES-ANYCAST -origin: AS4242420119 -mnt-by: JRB0001-MNT -bgp-status: inactive 1499875220 diff --git a/data/route/172.21.64.96_29 b/data/route/172.21.64.96_29 deleted file mode 100644 index 23cf8ce0d..000000000 --- a/data/route/172.21.64.96_29 +++ /dev/null @@ -1,5 +0,0 @@ -route: 172.21.64.96/29 -descr: JRB0001-SERVICES-ANYCAST -origin: AS4242420119 -mnt-by: JRB0001-MNT -bgp-status: active diff --git a/data/route6/fd42:5d71:219:1001::_64 b/data/route6/fd42:5d71:219:1001::_64 deleted file mode 100644 index 9ab798f9f..000000000 --- a/data/route6/fd42:5d71:219:1001::_64 +++ /dev/null @@ -1,4 +0,0 @@ -route6: fd42:5d71:219:1001::/64 -descr: JRB0001-SERVICES-DE-1 -origin: AS4242420118 -mnt-by: JRB0001-MNT diff --git a/data/route6/fd42:5d71:219:1002::_64 b/data/route6/fd42:5d71:219:1002::_64 deleted file mode 100644 index 0809a64ba..000000000 --- a/data/route6/fd42:5d71:219:1002::_64 +++ /dev/null @@ -1,4 +0,0 @@ -route6: fd42:5d71:219:1002::/64 -descr: JRB0001-SERVICES-FR-1 -origin: AS4242420118 -mnt-by: JRB0001-MNT diff --git a/data/route6/fd42:5d71:219:1003::_64 b/data/route6/fd42:5d71:219:1003::_64 deleted file mode 100644 index 83d82731f..000000000 --- a/data/route6/fd42:5d71:219:1003::_64 +++ /dev/null @@ -1,4 +0,0 @@ -route6: fd42:5d71:219:1003::/64 -descr: JRB0001-SERVICES-NL-1 -origin: AS4242420118 -mnt-by: JRB0001-MNT diff --git a/data/route6/fd42:5d71:219:1::_64 b/data/route6/fd42:5d71:219:1::_64 deleted file mode 100644 index 425d5d33a..000000000 --- a/data/route6/fd42:5d71:219:1::_64 +++ /dev/null @@ -1,4 +0,0 @@ -route6: fd42:5d71:219:1::/64 -descr: JRB0001-SERVICES-ANYCAST -origin: AS4242420119 -mnt-by: JRB0001-MNT diff --git a/data/route6/fd42:5d71:219:2::_64 b/data/route6/fd42:5d71:219:2::_64 deleted file mode 100644 index 2e0d3554d..000000000 --- a/data/route6/fd42:5d71:219:2::_64 +++ /dev/null @@ -1,4 +0,0 @@ -route6: fd42:5d71:219:2::/64 -descr: JRB0001-SERVICES-ANYCAST -origin: AS4242420119 -mnt-by: JRB0001-MNT From 508e704a3cb5261b6fb59fbcccbed8c771bb5261 Mon Sep 17 00:00:00 2001 From: jrb0001 Date: Thu, 30 Nov 2017 21:35:31 +0100 Subject: [PATCH 2/2] Add new objects for the node subnet --- data/inet6num/fd42:5d71:219::_48 | 2 +- data/inet6num/fd42:5d71:219::_64 | 7 +++++++ data/inetnum/{172.20.14.32_27 => 172.20.155.0_25} | 4 ++-- data/inetnum/172.20.155.0_26 | 8 ++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 data/inet6num/fd42:5d71:219::_64 rename data/inetnum/{172.20.14.32_27 => 172.20.155.0_25} (68%) create mode 100644 data/inetnum/172.20.155.0_26 diff --git a/data/inet6num/fd42:5d71:219::_48 b/data/inet6num/fd42:5d71:219::_48 index 2ef481349..8bf408b0a 100644 --- a/data/inet6num/fd42:5d71:219::_48 +++ b/data/inet6num/fd42:5d71:219::_48 @@ -4,4 +4,4 @@ admin-c: JRB0001-DN42 tech-c: JRB0001-DN42 mnt-by: JRB0001-MNT status: ALLOCATED PA -cidr: fd42:5d71:219::/48 +cidr: fd42:5d71:219::/48 diff --git a/data/inet6num/fd42:5d71:219::_64 b/data/inet6num/fd42:5d71:219::_64 new file mode 100644 index 000000000..a9e1c7078 --- /dev/null +++ b/data/inet6num/fd42:5d71:219::_64 @@ -0,0 +1,7 @@ +inet6num: fd42:5d71:219::-fd42:5d71:219:FFFF:FFFF:FFFF:FFFF:FFFF +netname: JRB0001 - Nodes +admin-c: JRB0001-DN42 +tech-c: JRB0001-DN42 +mnt-by: JRB0001-MNT +status: ASSIGNED PA +cidr: fd42:5d71:219::/64 diff --git a/data/inetnum/172.20.14.32_27 b/data/inetnum/172.20.155.0_25 similarity index 68% rename from data/inetnum/172.20.14.32_27 rename to data/inetnum/172.20.155.0_25 index d792661a1..dc37bb488 100644 --- a/data/inetnum/172.20.14.32_27 +++ b/data/inetnum/172.20.155.0_25 @@ -1,8 +1,8 @@ -inetnum: 172.20.14.32-172.20.14.63 +inetnum: 172.20.155.0-172.20.155.127 netname: JRB0001 admin-c: JRB0001-DN42 tech-c: JRB0001-DN42 mnt-by: JRB0001-MNT status: ALLOCATED PA bgp-status: active -cidr: 172.20.14.32/27 +cidr: 172.20.155.0/25 diff --git a/data/inetnum/172.20.155.0_26 b/data/inetnum/172.20.155.0_26 new file mode 100644 index 000000000..d92cbb3c0 --- /dev/null +++ b/data/inetnum/172.20.155.0_26 @@ -0,0 +1,8 @@ +inetnum: 172.20.155.0-172.20.155.63 +netname: JRB0001 - Nodes +admin-c: JRB0001-DN42 +tech-c: JRB0001-DN42 +mnt-by: JRB0001-MNT +status: ASSIGNED PA +bgp-status: active +cidr: 172.20.155.0/26