From 21f968e4e9b01ef17a462ec42909db22041dd8ef Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Sun, 26 Aug 2018 22:11:14 +0800 Subject: [PATCH] ATR-MNT: Re-organize the network and resources - remove AS4242421237 - add detailed route objects - add additional IPv6 blocks for geo routing purpose - adjust IPv6 route objects to fit new address space - add new GPG key fingerprint - Simplify topology - Release 172.20.56.0/25 - Remove several detail routes * Adjust ramaining network to fit new topology - update route object desc - add detailed route6 object - add inet6num object for detailed blocks --- data/aut-num/AS4242421237 | 9 --------- data/inet6num/fd0a:3599:3930::_48 | 6 +----- data/inet6num/fd18:18d9:adde:40::_58 | 12 ++++++++++++ data/inet6num/fd18:18d9:adde::_48 | 12 ++++++++++++ data/inet6num/fd18:18d9:adde::_58 | 10 ++++++++++ data/inet6num/fd18:18d9:adde:f000::_52 | 11 +++++++++++ data/inet6num/fdd1:1c64:66fd::_48 | 10 ++++++++++ data/inet6num/fdd1:1c64:66fd::_58 | 10 ++++++++++ data/inetnum/172.20.129.64_26 | 7 +++---- data/inetnum/172.20.197.184_29 | 5 ++--- data/inetnum/172.20.228.96_27 | 8 ++++---- data/inetnum/172.20.231.192_27 | 8 +++----- data/inetnum/172.20.56.0_25 | 10 ---------- data/mntner/ATR-MNT | 1 + data/route/172.20.129.64_26 | 4 ++-- data/route/172.20.197.184_29 | 3 +-- data/route/172.20.228.96_27 | 5 +++++ data/route/172.20.231.192_27 | 2 +- data/route6/fd0a:3599:3930::_48 | 1 - .../172.20.56.0_25 => route6/fd0a:3599:3930::_58} | 4 ++-- data/route6/fd18:18d9:adde:40::_58 | 5 +++++ .../172.20.228.96_28 => route6/fd18:18d9:adde::_48} | 4 ++-- .../172.20.228.112_28 => route6/fd18:18d9:adde::_58} | 4 ++-- data/route6/fd18:18d9:adde:f000::_52 | 5 +++++ data/route6/fdd1:1c64:66fd::_48 | 5 +++++ data/route6/fdd1:1c64:66fd::_58 | 5 +++++ 26 files changed, 114 insertions(+), 52 deletions(-) delete mode 100644 data/aut-num/AS4242421237 create mode 100644 data/inet6num/fd18:18d9:adde:40::_58 create mode 100644 data/inet6num/fd18:18d9:adde::_48 create mode 100644 data/inet6num/fd18:18d9:adde::_58 create mode 100644 data/inet6num/fd18:18d9:adde:f000::_52 create mode 100644 data/inet6num/fdd1:1c64:66fd::_48 create mode 100644 data/inet6num/fdd1:1c64:66fd::_58 delete mode 100644 data/inetnum/172.20.56.0_25 create mode 100644 data/route/172.20.228.96_27 rename data/{route/172.20.56.0_25 => route6/fd0a:3599:3930::_58} (54%) create mode 100644 data/route6/fd18:18d9:adde:40::_58 rename data/{route/172.20.228.96_28 => route6/fd18:18d9:adde::_48} (50%) rename data/{route/172.20.228.112_28 => route6/fd18:18d9:adde::_58} (50%) create mode 100644 data/route6/fd18:18d9:adde:f000::_52 create mode 100644 data/route6/fdd1:1c64:66fd::_48 create mode 100644 data/route6/fdd1:1c64:66fd::_58 diff --git a/data/aut-num/AS4242421237 b/data/aut-num/AS4242421237 deleted file mode 100644 index 194041c04..000000000 --- a/data/aut-num/AS4242421237 +++ /dev/null @@ -1,9 +0,0 @@ -aut-num: AS4242421237 -as-name: ATR-INNER -descr: ATR Inner Routing Network -admin-c: ALLENZ-DN42 -tech-c: ALLENZ-DN42 -mnt-by: ATR-MNT -remarks: Internal network for ATR -remarks: See AS4242421233 for peering -source: DN42 diff --git a/data/inet6num/fd0a:3599:3930::_48 b/data/inet6num/fd0a:3599:3930::_48 index aeb2330e4..b52dd4c14 100644 --- a/data/inet6num/fd0a:3599:3930::_48 +++ b/data/inet6num/fd0a:3599:3930::_48 @@ -1,11 +1,7 @@ inet6num: fd0a:3599:3930:0000:0000:0000:0000:0000 - fd0a:3599:3930:ffff:ffff:ffff:ffff:ffff netname: ATR-IPV6 descr: IPv6 Block of ATR Net -country: CN -country: JP -country: US -country: FR -country: RU +country: EU admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT diff --git a/data/inet6num/fd18:18d9:adde:40::_58 b/data/inet6num/fd18:18d9:adde:40::_58 new file mode 100644 index 000000000..a2fd2c83f --- /dev/null +++ b/data/inet6num/fd18:18d9:adde:40::_58 @@ -0,0 +1,12 @@ +inet6num: fd18:18d9:adde:0040:0000:0000:0000:0000 - fd18:18d9:adde:007f:ffff:ffff:ffff:ffff +netname: ATR-IPV6-CORE +descr: ATR Core Routing Network +country: CN +country: HK +country: JP +admin-c: ALLENZ-DN42 +tech-c: ALLENZ-DN42 +mnt-by: ATR-MNT +status: ASSIGNED +cidr: fd18:18d9:adde:40::/58 +source: DN42 diff --git a/data/inet6num/fd18:18d9:adde::_48 b/data/inet6num/fd18:18d9:adde::_48 new file mode 100644 index 000000000..59c4e4594 --- /dev/null +++ b/data/inet6num/fd18:18d9:adde::_48 @@ -0,0 +1,12 @@ +inet6num: fd18:18d9:adde:0000:0000:0000:0000:0000 - fd18:18d9:adde:ffff:ffff:ffff:ffff:ffff +netname: ATR-IPV6 +descr: IPv6 Block of ATR Net +country: CN +country: HK +country: JP +admin-c: ALLENZ-DN42 +tech-c: ALLENZ-DN42 +mnt-by: ATR-MNT +status: ALLOCATED +cidr: fd18:18d9:adde::/48 +source: DN42 diff --git a/data/inet6num/fd18:18d9:adde::_58 b/data/inet6num/fd18:18d9:adde::_58 new file mode 100644 index 000000000..d881e271c --- /dev/null +++ b/data/inet6num/fd18:18d9:adde::_58 @@ -0,0 +1,10 @@ +inet6num: fd18:18d9:adde:0000:0000:0000:0000:0000 - fd18:18d9:adde:003f:ffff:ffff:ffff:ffff +netname: ATR-IPV6-ASIA +descr: ATR Asia Transit +country: CN +admin-c: ALLENZ-DN42 +tech-c: ALLENZ-DN42 +mnt-by: ATR-MNT +status: ASSIGNED +cidr: fd18:18d9:adde::/58 +source: DN42 diff --git a/data/inet6num/fd18:18d9:adde:f000::_52 b/data/inet6num/fd18:18d9:adde:f000::_52 new file mode 100644 index 000000000..1dd5e234f --- /dev/null +++ b/data/inet6num/fd18:18d9:adde:f000::_52 @@ -0,0 +1,11 @@ +inet6num: fd18:18d9:adde:f000:0000:0000:0000:0000 - fd18:18d9:adde:ffff:ffff:ffff:ffff:ffff +netname: ATR-IPV6-ANYCAST +descr: ATR Anycast Address +country: JP +country: EU +admin-c: ALLENZ-DN42 +tech-c: ALLENZ-DN42 +mnt-by: ATR-MNT +status: ASSIGNED +cidr: fd18:18d9:adde:f000::/52 +source: DN42 diff --git a/data/inet6num/fdd1:1c64:66fd::_48 b/data/inet6num/fdd1:1c64:66fd::_48 new file mode 100644 index 000000000..bf79a9699 --- /dev/null +++ b/data/inet6num/fdd1:1c64:66fd::_48 @@ -0,0 +1,10 @@ +inet6num: fdd1:1c64:66fd:0000:0000:0000:0000:0000 - fdd1:1c64:66fd:ffff:ffff:ffff:ffff:ffff +netname: ATR-IPV6 +descr: IPv6 Block of ATR Net +country: US +admin-c: ALLENZ-DN42 +tech-c: ALLENZ-DN42 +mnt-by: ATR-MNT +status: ALLOCATED +cidr: fdd1:1c64:66fd::/48 +source: DN42 diff --git a/data/inet6num/fdd1:1c64:66fd::_58 b/data/inet6num/fdd1:1c64:66fd::_58 new file mode 100644 index 000000000..af3d45f1c --- /dev/null +++ b/data/inet6num/fdd1:1c64:66fd::_58 @@ -0,0 +1,10 @@ +inet6num: fdd1:1c64:66fd:0000:0000:0000:0000:0000 - fdd1:1c64:66fd:003f:ffff:ffff:ffff:ffff +netname: ATR-IPV6-NA +descr: ATR North America +country: US +admin-c: ALLENZ-DN42 +tech-c: ALLENZ-DN42 +mnt-by: ATR-MNT +status: ASSIGNED +cidr: fdd1:1c64:66fd::/58 +source: DN42 diff --git a/data/inetnum/172.20.129.64_26 b/data/inetnum/172.20.129.64_26 index 2a68f63cd..4dc5a77db 100644 --- a/data/inetnum/172.20.129.64_26 +++ b/data/inetnum/172.20.129.64_26 @@ -1,10 +1,9 @@ inetnum: 172.20.129.64 - 172.20.129.127 -netname: ATR-HOSTS -descr: ATR Network for Private Hosts +netname: ATR-AsiaPasific +descr: ATR Network in Asia Pasific country: CN +country: HK country: JP -country: RU -country: US admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT diff --git a/data/inetnum/172.20.197.184_29 b/data/inetnum/172.20.197.184_29 index 82274bee7..54581c4c0 100644 --- a/data/inetnum/172.20.197.184_29 +++ b/data/inetnum/172.20.197.184_29 @@ -1,11 +1,10 @@ inetnum: 172.20.197.184 - 172.20.197.191 netname: ATR-TRANSIT descr: ATR Internal Transit Addresses -country: CN -country: US +country: HK admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT -status: ALLOCATED +status: ASSIGNED cidr: 172.20.197.184/29 source: DN42 diff --git a/data/inetnum/172.20.228.96_27 b/data/inetnum/172.20.228.96_27 index f5cbc2609..128cdaccd 100644 --- a/data/inetnum/172.20.228.96_27 +++ b/data/inetnum/172.20.228.96_27 @@ -1,12 +1,12 @@ inetnum: 172.20.228.96 - 172.20.228.127 -netname: ATR-EDGE-AE -descr: ATR Edge Peering Network in Atlantic and Europe +netname: ATR-EU +descr: ATR Network in Atlantic and Europe +country: DE country: FR -country: US country: NL admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT -status: ALLOCATED +status: ASSIGNED cidr: 172.20.228.96/27 source: DN42 diff --git a/data/inetnum/172.20.231.192_27 b/data/inetnum/172.20.231.192_27 index 999d66d05..c5cf993fe 100644 --- a/data/inetnum/172.20.231.192_27 +++ b/data/inetnum/172.20.231.192_27 @@ -1,9 +1,7 @@ inetnum: 172.20.231.192 - 172.20.231.223 -netname: ATR-EDGE-AP -descr: ATR Edge Network in Asia Pasific Region -country: JP -country: CN -country: AU +netname: ATR-America +descr: ATR Network in America +country: US admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT diff --git a/data/inetnum/172.20.56.0_25 b/data/inetnum/172.20.56.0_25 deleted file mode 100644 index 7179280aa..000000000 --- a/data/inetnum/172.20.56.0_25 +++ /dev/null @@ -1,10 +0,0 @@ -inetnum: 172.20.56.0 - 172.20.56.127 -netname: ATR-HOSTS -descr: ATR Reserved Network for Hosts -country: CN -admin-c: ALLENZ-DN42 -tech-c: ALLENZ-DN42 -mnt-by: ATR-MNT -status: ASSIGNED -cidr: 172.20.56.0/25 -source: DN42 diff --git a/data/mntner/ATR-MNT b/data/mntner/ATR-MNT index 5efb41d5d..63932673f 100644 --- a/data/mntner/ATR-MNT +++ b/data/mntner/ATR-MNT @@ -1,6 +1,7 @@ mntner: ATR-MNT descr: ATR Maintenance Object auth: pgp-fingerprint 328C0C0A5F78B322C7D07DA1FEBB1B95F7964FB5 +auth: pgp-fingerprint 5C7CFA3B74A5782B5A20441A7D78D22D23333B33 auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDiqDUmhfOfP8h8+jcRw6ZRjQRPY/qAlpjujH2b02nl/SxuiQGa1AmMtdUWKu2emZ6SRhBrDW7m7odQjmujlzWpwvxVJ66jAtb7Uh+ijC/VlHLnB5RNMQAslHBuLHhYDX+9D4MDJbNO6qtOnGMDyT6mMKILtz7XjJRBYQK4zBxuPRjaaV5U8d8yS22Gc62kfxr+cpgmTqMrgovDvVRniiuHS7ga9dQS87LNokgZTDoMgv9igH89lDO6EyRK4rTpuy2v2QttYfQPiLL/2lXJTzH5FiTfrcFsBf6CLenDk63vvmlDyWAYf+vtZa1syNzDaPme3RB/IOva57Stc+bEzAV auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1mSWfO7rkb0zPMa6mdEXaYaiYYasA0SktdUzJdMYtLDLbMLRhuCnf4rBJ/lmkp01zK4X2tos54SlrghOd6B0CbzszR+lQu/BYDobnbk27NvpfId4WxZ6gwiTELyIzrhu1MgBQxHLy1pn5O7Nhg+RZvJda3MwlxFC2dARkOaohJQmsdyvDpYt6s3jmuq3gdDofZ8X7WJReLhQEAYhb+mN1KyTyksnLLCPj5h+EjxWvmnBsb104ASNHp5iSgE4oh6DK0zhsEZGM4AgHX8H2LYzVjmAK3OwzNazyiTs8w07tcC3vo9T/vpZWlBjZUIZiEI2FOdCIT2jIMXRMZUhADqvZ admin-c: ALLENZ-DN42 diff --git a/data/route/172.20.129.64_26 b/data/route/172.20.129.64_26 index 9fddcba0e..d4807fbf6 100644 --- a/data/route/172.20.129.64_26 +++ b/data/route/172.20.129.64_26 @@ -1,5 +1,5 @@ route: 172.20.129.64/26 -descr: ATR Network for Private Hosts -origin: AS4242421237 +descr: ATR Network in Asia Pasific +origin: AS4242421233 mnt-by: ATR-MNT source: DN42 diff --git a/data/route/172.20.197.184_29 b/data/route/172.20.197.184_29 index 5114e35ff..8b284ff89 100644 --- a/data/route/172.20.197.184_29 +++ b/data/route/172.20.197.184_29 @@ -1,6 +1,5 @@ route: 172.20.197.184/29 -descr: ATR Internal Virtulazation Addresses -origin: AS4242421237 +descr: ATR Trasit & Virtualization Addresses origin: AS4242421233 mnt-by: ATR-MNT source: DN42 diff --git a/data/route/172.20.228.96_27 b/data/route/172.20.228.96_27 new file mode 100644 index 000000000..34cbe517e --- /dev/null +++ b/data/route/172.20.228.96_27 @@ -0,0 +1,5 @@ +route: 172.20.228.96/27 +descr: ATR Network in Atlantic and Europe +origin: AS4242421233 +mnt-by: ATR-MNT +source: DN42 diff --git a/data/route/172.20.231.192_27 b/data/route/172.20.231.192_27 index 98358ac69..4f0f928e6 100644 --- a/data/route/172.20.231.192_27 +++ b/data/route/172.20.231.192_27 @@ -1,5 +1,5 @@ route: 172.20.231.192/27 -descr: ATR Edge Peering Network Asia Pasific +descr: ATR Network in America origin: AS4242421233 mnt-by: ATR-MNT source: DN42 diff --git a/data/route6/fd0a:3599:3930::_48 b/data/route6/fd0a:3599:3930::_48 index 027408ed8..cee49b8c3 100644 --- a/data/route6/fd0a:3599:3930::_48 +++ b/data/route6/fd0a:3599:3930::_48 @@ -1,6 +1,5 @@ route6: fd0a:3599:3930::/48 descr: ATR's IPv6 Network origin: AS4242421233 -origin: AS4242421237 mnt-by: ATR-MNT source: DN42 diff --git a/data/route/172.20.56.0_25 b/data/route6/fd0a:3599:3930::_58 similarity index 54% rename from data/route/172.20.56.0_25 rename to data/route6/fd0a:3599:3930::_58 index fa2dd2020..14f25d459 100644 --- a/data/route/172.20.56.0_25 +++ b/data/route6/fd0a:3599:3930::_58 @@ -1,5 +1,5 @@ -route: 172.20.56.0/25 -descr: ATR's IPv4 Block +route6: fd0a:3599:3930::/58 +descr: ATR Europe origin: AS4242421233 mnt-by: ATR-MNT source: DN42 diff --git a/data/route6/fd18:18d9:adde:40::_58 b/data/route6/fd18:18d9:adde:40::_58 new file mode 100644 index 000000000..af5129d06 --- /dev/null +++ b/data/route6/fd18:18d9:adde:40::_58 @@ -0,0 +1,5 @@ +route6: fd18:18d9:adde:40::/58 +descr: ATR Core Routing Network +origin: AS4242421233 +mnt-by: ATR-MNT +source: DN42 diff --git a/data/route/172.20.228.96_28 b/data/route6/fd18:18d9:adde::_48 similarity index 50% rename from data/route/172.20.228.96_28 rename to data/route6/fd18:18d9:adde::_48 index 8e6d90abe..f6b57918c 100644 --- a/data/route/172.20.228.96_28 +++ b/data/route6/fd18:18d9:adde::_48 @@ -1,5 +1,5 @@ -route: 172.20.228.96/28 -descr: ATR Edge Peering Network EU +route6: fd18:18d9:adde::/48 +descr: ATR's IPv6 Network origin: AS4242421233 mnt-by: ATR-MNT source: DN42 diff --git a/data/route/172.20.228.112_28 b/data/route6/fd18:18d9:adde::_58 similarity index 50% rename from data/route/172.20.228.112_28 rename to data/route6/fd18:18d9:adde::_58 index b6b5e4e7e..aa5ebd122 100644 --- a/data/route/172.20.228.112_28 +++ b/data/route6/fd18:18d9:adde::_58 @@ -1,5 +1,5 @@ -route: 172.20.228.112/28 -descr: ATR Edge Peering Network US +route6: fd18:18d9:adde::/58 +descr: ATR Home Routing Network origin: AS4242421233 mnt-by: ATR-MNT source: DN42 diff --git a/data/route6/fd18:18d9:adde:f000::_52 b/data/route6/fd18:18d9:adde:f000::_52 new file mode 100644 index 000000000..93e61a26b --- /dev/null +++ b/data/route6/fd18:18d9:adde:f000::_52 @@ -0,0 +1,5 @@ +route6: fd18:18d9:adde:f000::/52 +descr: ATR IPv6 Anycast Network +origin: AS4242421233 +mnt-by: ATR-MNT +source: DN42 diff --git a/data/route6/fdd1:1c64:66fd::_48 b/data/route6/fdd1:1c64:66fd::_48 new file mode 100644 index 000000000..71352b985 --- /dev/null +++ b/data/route6/fdd1:1c64:66fd::_48 @@ -0,0 +1,5 @@ +route6: fdd1:1c64:66fd::/48 +descr: ATR's IPv6 Network +origin: AS4242421233 +mnt-by: ATR-MNT +source: DN42 diff --git a/data/route6/fdd1:1c64:66fd::_58 b/data/route6/fdd1:1c64:66fd::_58 new file mode 100644 index 000000000..d7748ad9c --- /dev/null +++ b/data/route6/fdd1:1c64:66fd::_58 @@ -0,0 +1,5 @@ +route6: fdd1:1c64:66fd::/58 +descr: ATR North America +origin: AS4242421233 +mnt-by: ATR-MNT +source: DN42