From 1c9373dde56f8b87dc88ba431f9dab42f17790fc Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Sun, 17 Jun 2018 22:40:28 +0800 Subject: [PATCH 1/8] ATR-MNT: add pgp fingerprint --- data/mntner/ATR-MNT | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mntner/ATR-MNT b/data/mntner/ATR-MNT index 7e963cffc..7d1a77092 100644 --- a/data/mntner/ATR-MNT +++ b/data/mntner/ATR-MNT @@ -1,5 +1,6 @@ mntner: ATR-MNT -descr: ATR +descr: ATR Maintenance Object +auth: pgp-fingerprint 328C0C0A5F78B322C7D07DA1FEBB1B95F7964FB5 sha512-pw: YzBjMGM4ODYxMTlhNGQ4MDE4MzM2NWVmOTE4YWU1YjE4Yjg3Mjk2OTAyMjM4YTNjZmY1MWNjMDdhMWQ4NDU5MjA2NTljYjczMjNhZDg4OTk5OGI3NGUwMDhlODJiOGVkNjc2MjM0MDEwYWRiOWE1YzBkNzY5ZDFjOWUwOWQwYTU5ZmE5MDU2ZGU3MmZlODg0ZTc1MDI3MWQ1YjY5MTQ5MGY4YTYwMWNjZTk0YmViMjhjYmM1ODRlYTM2M2ViMzk1ODc0NDY5OTM3NjYxZWQ2ODMwOGM3MDBmZGRmZGZhMjg1ZWE4NGFlZTEyNWZiNjRiMDg0YTYzNGI0MWFmNDU0ODM3NmFjNTlmODYyZTQ5OWE5NWNlYmViYzBlMjk4MGFjZjM3NTA3OTYyODQ0OWNiOTBiNTA0NDQ2NmQzM2YwODM1YTNhODNmOGYyYzA4NGE0ZjZmYTBjOWVlNzI0ZmQ1MmY5YWI3ODI3NjM4MjEyNDAyYzgwNmRlOTdmZDQ0M2M4N2I2MDgyYTdkNzc5NjIzZTEwNjkzMGMwN2ZiYTQxZmMwZTQwZWI5Y2M5ZDRmNjQ0MmE1ZmFmZjNkZmFiNzYzMjBkNjliNDNhZDI2NGVlODMxNjIzNmVhZDQzOThlZjA5MDdkOTM4OWM3NjljNWU4ZDQ3YmUwMjM4OGY2NzhlMGI= admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 From 5ce41d4447d64a4b4b2b564f1a4c54852cdc7d51 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Sun, 17 Jun 2018 22:58:42 +0800 Subject: [PATCH 2/8] ATR-MNT: update ALLENZ-DN42 contact & remove sha512-pw --- data/mntner/ATR-MNT | 1 - data/person/ALLENZ-DN42 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mntner/ATR-MNT b/data/mntner/ATR-MNT index 7d1a77092..efad1b287 100644 --- a/data/mntner/ATR-MNT +++ b/data/mntner/ATR-MNT @@ -1,7 +1,6 @@ mntner: ATR-MNT descr: ATR Maintenance Object auth: pgp-fingerprint 328C0C0A5F78B322C7D07DA1FEBB1B95F7964FB5 -sha512-pw: YzBjMGM4ODYxMTlhNGQ4MDE4MzM2NWVmOTE4YWU1YjE4Yjg3Mjk2OTAyMjM4YTNjZmY1MWNjMDdhMWQ4NDU5MjA2NTljYjczMjNhZDg4OTk5OGI3NGUwMDhlODJiOGVkNjc2MjM0MDEwYWRiOWE1YzBkNzY5ZDFjOWUwOWQwYTU5ZmE5MDU2ZGU3MmZlODg0ZTc1MDI3MWQ1YjY5MTQ5MGY4YTYwMWNjZTk0YmViMjhjYmM1ODRlYTM2M2ViMzk1ODc0NDY5OTM3NjYxZWQ2ODMwOGM3MDBmZGRmZGZhMjg1ZWE4NGFlZTEyNWZiNjRiMDg0YTYzNGI0MWFmNDU0ODM3NmFjNTlmODYyZTQ5OWE5NWNlYmViYzBlMjk4MGFjZjM3NTA3OTYyODQ0OWNiOTBiNTA0NDQ2NmQzM2YwODM1YTNhODNmOGYyYzA4NGE0ZjZmYTBjOWVlNzI0ZmQ1MmY5YWI3ODI3NjM4MjEyNDAyYzgwNmRlOTdmZDQ0M2M4N2I2MDgyYTdkNzc5NjIzZTEwNjkzMGMwN2ZiYTQxZmMwZTQwZWI5Y2M5ZDRmNjQ0MmE1ZmFmZjNkZmFiNzYzMjBkNjliNDNhZDI2NGVlODMxNjIzNmVhZDQzOThlZjA5MDdkOTM4OWM3NjljNWU4ZDQ3YmUwMjM4OGY2NzhlMGI= admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT diff --git a/data/person/ALLENZ-DN42 b/data/person/ALLENZ-DN42 index 913ca795d..d286147ee 100644 --- a/data/person/ALLENZ-DN42 +++ b/data/person/ALLENZ-DN42 @@ -1,5 +1,6 @@ person: allenZ contact: allen@moe.cat +contact: telegram:AstroProfundis nic-hdl: ALLENZ-DN42 mnt-by: ATR-MNT source: DN42 From 99d8f36a0e8cd60116194921d9a808d9f869c3be Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Thu, 28 Jun 2018 14:52:40 +0800 Subject: [PATCH 3/8] ATR-MNT: update inetnum & route objs to fit new topology --- data/inet6num/fd0a:3599:3930::_48 | 4 ++++ data/inetnum/172.20.129.64_26 | 7 +++++-- data/inetnum/172.20.228.96_27 | 2 ++ data/inetnum/172.20.231.192_27 | 8 +++++--- data/route/172.20.129.64_26 | 4 ++-- data/route/172.20.228.112_28 | 5 +++++ data/route/{172.20.228.96_27 => 172.20.228.96_28} | 4 ++-- data/route/172.20.231.192_27 | 3 +-- data/route6/fd0a:3599:3930::_48 | 3 ++- 9 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 data/route/172.20.228.112_28 rename data/route/{172.20.228.96_27 => 172.20.228.96_28} (50%) diff --git a/data/inet6num/fd0a:3599:3930::_48 b/data/inet6num/fd0a:3599:3930::_48 index aae087996..aeb2330e4 100644 --- a/data/inet6num/fd0a:3599:3930::_48 +++ b/data/inet6num/fd0a:3599:3930::_48 @@ -2,6 +2,10 @@ inet6num: fd0a:3599:3930:0000:0000:0000:0000:0000 - fd0a:3599:3930:fff netname: ATR-IPV6 descr: IPv6 Block of ATR Net country: CN +country: JP +country: US +country: FR +country: RU admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT diff --git a/data/inetnum/172.20.129.64_26 b/data/inetnum/172.20.129.64_26 index e9b4cc3bb..aff248da1 100644 --- a/data/inetnum/172.20.129.64_26 +++ b/data/inetnum/172.20.129.64_26 @@ -1,10 +1,13 @@ inetnum: 172.20.129.64 - 172.20.129.127 netname: ATR-HOSTS -descr: ATR Open Network for Hosts +descr: ATR Network for Private Hosts +country: CN +country: JP +country: RU country: US admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT -status: ASSIGNED +status: ALLOCATED cidr: 172.20.129.64/26 source: DN42 diff --git a/data/inetnum/172.20.228.96_27 b/data/inetnum/172.20.228.96_27 index 8a0a6bf02..403bc675e 100644 --- a/data/inetnum/172.20.228.96_27 +++ b/data/inetnum/172.20.228.96_27 @@ -2,6 +2,8 @@ inetnum: 172.20.228.96 - 172.20.228.127 netname: ATR-EDGE descr: ATR Edge Peering Network country: FR +country: US +country: NL admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT diff --git a/data/inetnum/172.20.231.192_27 b/data/inetnum/172.20.231.192_27 index bf1336e73..26b4096f8 100644 --- a/data/inetnum/172.20.231.192_27 +++ b/data/inetnum/172.20.231.192_27 @@ -1,10 +1,12 @@ inetnum: 172.20.231.192 - 172.20.231.223 -netname: ATR-CORE -descr: ATR Core Routing Network +netname: ATR-EDGE-AP +descr: ATR Edge Network in Asia Pasific Region country: JP +country: CN +country: AU admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT -status: ASSIGNED +status: ALLOCATED cidr: 172.20.231.192/27 source: DN42 diff --git a/data/route/172.20.129.64_26 b/data/route/172.20.129.64_26 index 99131dbc3..9fddcba0e 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 Open Network for Hosts -origin: AS4242421233 +descr: ATR Network for Private Hosts +origin: AS4242421237 mnt-by: ATR-MNT source: DN42 diff --git a/data/route/172.20.228.112_28 b/data/route/172.20.228.112_28 new file mode 100644 index 000000000..b6b5e4e7e --- /dev/null +++ b/data/route/172.20.228.112_28 @@ -0,0 +1,5 @@ +route: 172.20.228.112/28 +descr: ATR Edge Peering Network US +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_28 similarity index 50% rename from data/route/172.20.228.96_27 rename to data/route/172.20.228.96_28 index d3ad728cd..8e6d90abe 100644 --- a/data/route/172.20.228.96_27 +++ b/data/route/172.20.228.96_28 @@ -1,5 +1,5 @@ -route: 172.20.228.96/27 -descr: ATR Edge Peering Network +route: 172.20.228.96/28 +descr: ATR Edge Peering Network EU 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 6dbe0e60e..98358ac69 100644 --- a/data/route/172.20.231.192_27 +++ b/data/route/172.20.231.192_27 @@ -1,6 +1,5 @@ route: 172.20.231.192/27 -descr: ATR Core Routing Network -origin: AS4242421237 +descr: ATR Edge Peering Network Asia Pasific 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 c32cd80d0..027408ed8 100644 --- a/data/route6/fd0a:3599:3930::_48 +++ b/data/route6/fd0a:3599:3930::_48 @@ -1,5 +1,6 @@ route6: fd0a:3599:3930::/48 -descr: ATR's IPv6 +descr: ATR's IPv6 Network origin: AS4242421233 +origin: AS4242421237 mnt-by: ATR-MNT source: DN42 From 0db4f698064c9d66eae672c8d9ca0b9705486423 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Thu, 28 Jun 2018 14:58:21 +0800 Subject: [PATCH 4/8] ATR-MNT: update as-name of AS4242421237 --- data/aut-num/AS4242421237 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/aut-num/AS4242421237 b/data/aut-num/AS4242421237 index 41c514cb0..194041c04 100644 --- a/data/aut-num/AS4242421237 +++ b/data/aut-num/AS4242421237 @@ -1,9 +1,9 @@ aut-num: AS4242421237 -as-name: ATR-CORE +as-name: ATR-INNER descr: ATR Inner Routing Network admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT -remarks: Core internal network for ATR +remarks: Internal network for ATR remarks: See AS4242421233 for peering source: DN42 From 8d35c326a3583186ee4ad9df6e4bbfa3efc2fd63 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Mon, 16 Jul 2018 16:57:36 +0800 Subject: [PATCH 5/8] ATR-MNT: update network names --- data/inetnum/172.20.197.184_29 | 5 +++-- data/inetnum/172.20.228.96_27 | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data/inetnum/172.20.197.184_29 b/data/inetnum/172.20.197.184_29 index 375ead976..82274bee7 100644 --- a/data/inetnum/172.20.197.184_29 +++ b/data/inetnum/172.20.197.184_29 @@ -1,6 +1,7 @@ inetnum: 172.20.197.184 - 172.20.197.191 -netname: ATR-INNERVZ -descr: ATR Internal Virtulazation Addresses +netname: ATR-TRANSIT +descr: ATR Internal Transit Addresses +country: CN country: US admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 diff --git a/data/inetnum/172.20.228.96_27 b/data/inetnum/172.20.228.96_27 index 403bc675e..f5cbc2609 100644 --- a/data/inetnum/172.20.228.96_27 +++ b/data/inetnum/172.20.228.96_27 @@ -1,6 +1,6 @@ inetnum: 172.20.228.96 - 172.20.228.127 -netname: ATR-EDGE -descr: ATR Edge Peering Network +netname: ATR-EDGE-AE +descr: ATR Edge Peering Network in Atlantic and Europe country: FR country: US country: NL From f06861d776b86df70032b3f3895c56c3fa64c956 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Mon, 16 Jul 2018 17:05:09 +0800 Subject: [PATCH 6/8] ATR-MNT: add 2 of my SSH keys --- data/mntner/ATR-MNT | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/mntner/ATR-MNT b/data/mntner/ATR-MNT index efad1b287..5efb41d5d 100644 --- a/data/mntner/ATR-MNT +++ b/data/mntner/ATR-MNT @@ -1,6 +1,8 @@ mntner: ATR-MNT descr: ATR Maintenance Object auth: pgp-fingerprint 328C0C0A5F78B322C7D07DA1FEBB1B95F7964FB5 +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 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT From ae2deae4c30c342e51ca4a9398d8083a8235cf30 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Mon, 16 Jul 2018 17:17:18 +0800 Subject: [PATCH 7/8] ATR-MNT: update inet assignment --- data/inetnum/172.20.129.64_26 | 2 +- data/inetnum/172.20.231.192_27 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/inetnum/172.20.129.64_26 b/data/inetnum/172.20.129.64_26 index aff248da1..2a68f63cd 100644 --- a/data/inetnum/172.20.129.64_26 +++ b/data/inetnum/172.20.129.64_26 @@ -8,6 +8,6 @@ country: US admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT -status: ALLOCATED +status: ASSIGNED cidr: 172.20.129.64/26 source: DN42 diff --git a/data/inetnum/172.20.231.192_27 b/data/inetnum/172.20.231.192_27 index 26b4096f8..999d66d05 100644 --- a/data/inetnum/172.20.231.192_27 +++ b/data/inetnum/172.20.231.192_27 @@ -7,6 +7,6 @@ country: AU admin-c: ALLENZ-DN42 tech-c: ALLENZ-DN42 mnt-by: ATR-MNT -status: ALLOCATED +status: ASSIGNED cidr: 172.20.231.192/27 source: DN42 From 8a7bb56db5d2bfdf88c5cfc1ec559a95feebc727 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Mon, 16 Jul 2018 17:49:18 +0800 Subject: [PATCH 8/8] ATR-MNT: add sha512-pw back for backward compability --- data/mntner/ATR-MNT | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mntner/ATR-MNT b/data/mntner/ATR-MNT index 5efb41d5d..13b3505c8 100644 --- a/data/mntner/ATR-MNT +++ b/data/mntner/ATR-MNT @@ -1,5 +1,6 @@ mntner: ATR-MNT descr: ATR Maintenance Object + sha512-pw: YzBjMGM4ODYxMTlhNGQ4MDE4MzM2NWVmOTE4YWU1YjE4Yjg3Mjk2OTAyMjM4YTNjZmY1MWNjMDdhMWQ4NDU5MjA2NTljYjczMjNhZDg4OTk5OGI3NGUwMDhlODJiOGVkNjc2MjM0MDEwYWRiOWE1YzBkNzY5ZDFjOWUwOWQwYTU5ZmE5MDU2ZGU3MmZlODg0ZTc1MDI3MWQ1YjY5MTQ5MGY4YTYwMWNjZTk0YmViMjhjYmM1ODRlYTM2M2ViMzk1ODc0NDY5OTM3NjYxZWQ2ODMwOGM3MDBmZGRmZGZhMjg1ZWE4NGFlZTEyNWZiNjRiMDg0YTYzNGI0MWFmNDU0ODM3NmFjNTlmODYyZTQ5OWE5NWNlYmViYzBlMjk4MGFjZjM3NTA3OTYyODQ0OWNiOTBiNTA0NDQ2NmQzM2YwODM1YTNhODNmOGYyYzA4NGE0ZjZmYTBjOWVlNzI0ZmQ1MmY5YWI3ODI3NjM4MjEyNDAyYzgwNmRlOTdmZDQ0M2M4N2I2MDgyYTdkNzc5NjIzZTEwNjkzMGMwN2ZiYTQxZmMwZTQwZWI5Y2M5ZDRmNjQ0MmE1ZmFmZjNkZmFiNzYzMjBkNjliNDNhZDI2NGVlODMxNjIzNmVhZDQzOThlZjA5MDdkOTM4OWM3NjljNWU4ZDQ3YmUwMjM4OGY2NzhlMGI= auth: pgp-fingerprint 328C0C0A5F78B322C7D07DA1FEBB1B95F7964FB5 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