From f3b9ac05ed64251c44de1edd182255be6535ebbe Mon Sep 17 00:00:00 2001 From: KochiyaReiko Date: Thu, 6 Oct 2022 01:32:26 -0600 Subject: [PATCH] squashed commit: 6b5f1b7e3 test 3bff4a315 squashed commit: --- data/aut-num/AS4242420351 | 3 ++- data/dns/marionicnet.dn42 | 12 ++++++++---- data/inet6num/fd21:129:81d2::_48 | 2 ++ data/inetnum/172.23.37.192_27 | 14 ++++++++++++++ data/inetnum/172.23.37.96_27 | 2 +- data/organisation/ORG-TEAM-MARIONIC | 12 ++++++++++++ data/person/MARIONIC-DN42 | 7 +++++-- data/role/ORG-TEAM-MARIONIC-DN42 | 8 ++++++++ data/route/172.23.37.192_27 | 4 ++++ 9 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 data/inetnum/172.23.37.192_27 create mode 100644 data/organisation/ORG-TEAM-MARIONIC create mode 100644 data/role/ORG-TEAM-MARIONIC-DN42 create mode 100644 data/route/172.23.37.192_27 diff --git a/data/aut-num/AS4242420351 b/data/aut-num/AS4242420351 index 1e613dfbb..a1dfdc367 100644 --- a/data/aut-num/AS4242420351 +++ b/data/aut-num/AS4242420351 @@ -1,7 +1,8 @@ aut-num: AS4242420351 as-name: TEAM-MARIONIC-TESTNET-DN42 -descr: HELLO WORLD. +descr: Team Marionic DN42 Testnet admin-c: MARIONIC-DN42 tech-c: MARIONIC-DN42 +org: ORG-TEAM-MARIONIC mnt-by: MARIONIC-MNT source: DN42 diff --git a/data/dns/marionicnet.dn42 b/data/dns/marionicnet.dn42 index 975c94bfd..740d062e1 100644 --- a/data/dns/marionicnet.dn42 +++ b/data/dns/marionicnet.dn42 @@ -1,9 +1,13 @@ domain: marionicnet.dn42 admin-c: MARIONIC-DN42 tech-c: MARIONIC-DN42 +org: ORG-TEAM-MARIONIC +nserver: ns1.marionicnet.dn42 172.23.37.114 +nserver: ns1.marionicnet.dn42 fd21:129:81d2:7253:114:114:ac17:2572 +nserver: ns2.marionicnet.dn42 172.23.37.97 +nserver: ns2.marionicnet.dn42 fd21:129:81d2:0153::702 +nserver: ns3.marionicnet.dn42 172.23.37.209 +nserver: ns3.marionicnet.dn42 fd21:129:81d2:5153::723 +descr: NS1 will to be ANYCAST SERVER. mnt-by: MARIONIC-MNT -nserver: ns1.marionicnet.dn42 172.23.37.97 -nserver: ns1.marionicnet.dn42 fd21:129:81d2:0100::702 -nserver: ns2.marionicnet.dn42 172.23.37.105 -nserver: ns2.marionicnet.dn42 fd21:129:81d2:fe00::723 source: DN42 diff --git a/data/inet6num/fd21:129:81d2::_48 b/data/inet6num/fd21:129:81d2::_48 index 5dc8be869..47ef4b610 100644 --- a/data/inet6num/fd21:129:81d2::_48 +++ b/data/inet6num/fd21:129:81d2::_48 @@ -3,6 +3,8 @@ cidr: fd21:129:81d2::/48 netname: TEAM-MARIONIC-TESTNET-IP6 descr: Team Marionic IPv6 Testnet. country: CN +country: JP +country: US admin-c: MARIONIC-DN42 tech-c: MARIONIC-DN42 mnt-by: MARIONIC-MNT diff --git a/data/inetnum/172.23.37.192_27 b/data/inetnum/172.23.37.192_27 new file mode 100644 index 000000000..44f92c4f0 --- /dev/null +++ b/data/inetnum/172.23.37.192_27 @@ -0,0 +1,14 @@ +inetnum: 172.23.37.192 - 172.23.37.223 +cidr: 172.23.37.192/27 +netname: TEAM-MARIONIC-TESTNET-IP4 +descr: Team Marionic IPv4 Global Testnet. +country: CN +country: JP +country: US +admin-c: MARIONIC-DN42 +tech-c: MARIONIC-DN42 +mnt-by: MARIONIC-MNT +nserver: ns1.marionicnet.dn42 +nserver: ns2.marionicnet.dn42 +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.23.37.96_27 b/data/inetnum/172.23.37.96_27 index d63b1de73..ccfc59c2c 100644 --- a/data/inetnum/172.23.37.96_27 +++ b/data/inetnum/172.23.37.96_27 @@ -1,7 +1,7 @@ inetnum: 172.23.37.96 - 172.23.37.127 cidr: 172.23.37.96/27 netname: TEAM-MARIONIC-TESTNET-IP4 -descr: Team Marionic IPv4 Testnet. +descr: Team Marionic IPv4 China Testnet. country: CN admin-c: MARIONIC-DN42 tech-c: MARIONIC-DN42 diff --git a/data/organisation/ORG-TEAM-MARIONIC b/data/organisation/ORG-TEAM-MARIONIC new file mode 100644 index 000000000..ad169c8fd --- /dev/null +++ b/data/organisation/ORG-TEAM-MARIONIC @@ -0,0 +1,12 @@ +organisation: ORG-TEAM-MARIONIC +org-name: Team Marionic +admin-c: MARIONIC-DN42 +tech-c: MARIONIC-DN42 +abuse-c: MARIONIC-DN42 +e-mail: root@marionic.net +www: https://team.marionic.net +language: Chinese +language: Japanese +language: English +mnt-by: MARIONIC-MNT +source: DN42 diff --git a/data/person/MARIONIC-DN42 b/data/person/MARIONIC-DN42 index edf7c9584..7bbaa3856 100644 --- a/data/person/MARIONIC-DN42 +++ b/data/person/MARIONIC-DN42 @@ -1,6 +1,9 @@ person: MARIONIC -e-mail: root@marionic.net -contact: BackupGmail:larrynssupd@gmail.com +e-mail: root@marionic.net +org: ORG-TEAM-MARIONIC +remarks: country:CN,JP,US +nick: Marionic-Chan +contact: BackupGmail:larrynssupd@gmail.com nic-hdl: MARIONIC-DN42 mnt-by: MARIONIC-MNT source: DN42 diff --git a/data/role/ORG-TEAM-MARIONIC-DN42 b/data/role/ORG-TEAM-MARIONIC-DN42 new file mode 100644 index 000000000..3ca3cd2f2 --- /dev/null +++ b/data/role/ORG-TEAM-MARIONIC-DN42 @@ -0,0 +1,8 @@ +role: Team Marionic +abuse-mailbox: abuse@marionic.net +admin-c: MARIONIC-DN42 +tech-c: MARIONIC-DN42 +nic-hdl: ORG-TEAM-MARIONIC-DN42 +org: ORG-TEAM-MARIONIC +mnt-by: MARIONIC-MNT +source: DN42 diff --git a/data/route/172.23.37.192_27 b/data/route/172.23.37.192_27 new file mode 100644 index 000000000..4566955d3 --- /dev/null +++ b/data/route/172.23.37.192_27 @@ -0,0 +1,4 @@ +route: 172.23.37.192/27 +origin: AS4242420351 +mnt-by: MARIONIC-MNT +source: DN42