From e27f43c1132a8f01be39f129c968814c538a4147 Mon Sep 17 00:00:00 2001 From: Theo M Date: Thu, 11 Oct 2018 23:09:14 +1300 Subject: [PATCH 1/4] Reorganises Monarch's Network Adds new Monarch ASN AS64791, splits netblock in 2, assigns second /26 to AS64791 --- data/aut-num/AS64791 | 7 +++++++ data/inetnum/{172.23.203.0_25 => 172.23.203.0_26} | 6 +++--- data/inetnum/172.23.203.64_26 | 8 ++++++++ data/route/{172.23.203.0_25 => 172.23.203.0_26} | 4 ++-- data/route/172.23.203.64_26 | 4 ++++ 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 data/aut-num/AS64791 rename data/inetnum/{172.23.203.0_25 => 172.23.203.0_26} (52%) create mode 100644 data/inetnum/172.23.203.64_26 rename data/route/{172.23.203.0_25 => 172.23.203.0_26} (50%) create mode 100644 data/route/172.23.203.64_26 diff --git a/data/aut-num/AS64791 b/data/aut-num/AS64791 new file mode 100644 index 000000000..f24351be4 --- /dev/null +++ b/data/aut-num/AS64791 @@ -0,0 +1,7 @@ +aut-num: AS64791 +descr: Primary +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +as-name: MONARCH-PEER-AS +source: DN42 diff --git a/data/inetnum/172.23.203.0_25 b/data/inetnum/172.23.203.0_26 similarity index 52% rename from data/inetnum/172.23.203.0_25 rename to data/inetnum/172.23.203.0_26 index 5361bccae..c5f300468 100644 --- a/data/inetnum/172.23.203.0_25 +++ b/data/inetnum/172.23.203.0_26 @@ -1,6 +1,6 @@ -inetnum: 172.23.203.0 - 172.23.203.127 -cidr: 172.23.203.0/25 -netname: MONARCH-NETWORK +inetnum: 172.23.203.0 - 172.23.203.63 +cidr: 172.23.203.0/26 +netname: MONARCH-NETWORK-01 admin-c: THEOM-DN42 tech-c: THEOM-DN42 mnt-by: MONARCH-MNT diff --git a/data/inetnum/172.23.203.64_26 b/data/inetnum/172.23.203.64_26 new file mode 100644 index 000000000..37aff6406 --- /dev/null +++ b/data/inetnum/172.23.203.64_26 @@ -0,0 +1,8 @@ +inetnum: 172.23.203.64 - 172.23.203.127 +cidr: 172.23.203.64/26 +netname: MONARCH-NETWORK-02 +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +status: ASSIGNED +source: DN42 diff --git a/data/route/172.23.203.0_25 b/data/route/172.23.203.0_26 similarity index 50% rename from data/route/172.23.203.0_25 rename to data/route/172.23.203.0_26 index f256607a0..032919cac 100644 --- a/data/route/172.23.203.0_25 +++ b/data/route/172.23.203.0_26 @@ -1,4 +1,4 @@ -route: 172.23.203.0/25 +route: 172.23.203.0/26 origin: AS4242422376 mnt-by: MONARCH-MNT -source: DN42 \ No newline at end of file +source: DN42 diff --git a/data/route/172.23.203.64_26 b/data/route/172.23.203.64_26 new file mode 100644 index 000000000..1afde853b --- /dev/null +++ b/data/route/172.23.203.64_26 @@ -0,0 +1,4 @@ +route: 172.23.203.64/26 +origin: AS64791 +mnt-by: MONARCH-MNT +source: DN42 From e8b136f716c8fd91085c72fb756d8b85e250172b Mon Sep 17 00:00:00 2001 From: Theo M Date: Fri, 12 Oct 2018 22:03:56 +1300 Subject: [PATCH 2/4] Renames ASN --- data/aut-num/{AS64791 => AS4242422377} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename data/aut-num/{AS64791 => AS4242422377} (82%) diff --git a/data/aut-num/AS64791 b/data/aut-num/AS4242422377 similarity index 82% rename from data/aut-num/AS64791 rename to data/aut-num/AS4242422377 index f24351be4..5695bc575 100644 --- a/data/aut-num/AS64791 +++ b/data/aut-num/AS4242422377 @@ -1,4 +1,4 @@ -aut-num: AS64791 +aut-num: AS4242422377 descr: Primary admin-c: THEOM-DN42 tech-c: THEOM-DN42 From 2edb748111e1eeb94e67d3dc667f570b7a5b6866 Mon Sep 17 00:00:00 2001 From: Theo M Date: Fri, 12 Oct 2018 22:55:01 +1300 Subject: [PATCH 3/4] Fixes up origin --- data/route/172.23.203.64_26 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/route/172.23.203.64_26 b/data/route/172.23.203.64_26 index 1afde853b..fe3d11cd1 100644 --- a/data/route/172.23.203.64_26 +++ b/data/route/172.23.203.64_26 @@ -1,4 +1,4 @@ route: 172.23.203.64/26 -origin: AS64791 +origin: AS4242422377 mnt-by: MONARCH-MNT source: DN42 From 638bd0763c34028633e935b91e2436d4a3f0a65a Mon Sep 17 00:00:00 2001 From: Theo M Date: Fri, 12 Oct 2018 22:56:51 +1300 Subject: [PATCH 4/4] Fixes up formatting --- data/aut-num/AS4242422376 | 14 +++++++------- data/aut-num/AS4242422377 | 14 +++++++------- data/inetnum/172.23.203.0_26 | 16 ++++++++-------- data/inetnum/172.23.203.64_26 | 16 ++++++++-------- data/mntner/MONARCH-MNT | 14 +++++++------- data/organisation/ORG-MONARCH | 12 ++++++------ data/person/THEOM-DN42 | 12 ++++++------ data/route/172.23.203.0_26 | 8 ++++---- data/route/172.23.203.64_26 | 8 ++++---- 9 files changed, 57 insertions(+), 57 deletions(-) diff --git a/data/aut-num/AS4242422376 b/data/aut-num/AS4242422376 index 46dd9d05a..01f722aeb 100644 --- a/data/aut-num/AS4242422376 +++ b/data/aut-num/AS4242422376 @@ -1,7 +1,7 @@ -aut-num: AS4242422376 -descr: Primary -admin-c: THEOM-DN42 -tech-c: THEOM-DN42 -mnt-by: MONARCH-MNT -as-name: MONARCH-AS -source: DN42 +aut-num: AS4242422376 +descr: Primary +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +as-name: MONARCH-AS +source: DN42 diff --git a/data/aut-num/AS4242422377 b/data/aut-num/AS4242422377 index 5695bc575..415664d80 100644 --- a/data/aut-num/AS4242422377 +++ b/data/aut-num/AS4242422377 @@ -1,7 +1,7 @@ -aut-num: AS4242422377 -descr: Primary -admin-c: THEOM-DN42 -tech-c: THEOM-DN42 -mnt-by: MONARCH-MNT -as-name: MONARCH-PEER-AS -source: DN42 +aut-num: AS4242422377 +descr: Primary +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +as-name: MONARCH-PEER-AS +source: DN42 diff --git a/data/inetnum/172.23.203.0_26 b/data/inetnum/172.23.203.0_26 index c5f300468..42f857113 100644 --- a/data/inetnum/172.23.203.0_26 +++ b/data/inetnum/172.23.203.0_26 @@ -1,8 +1,8 @@ -inetnum: 172.23.203.0 - 172.23.203.63 -cidr: 172.23.203.0/26 -netname: MONARCH-NETWORK-01 -admin-c: THEOM-DN42 -tech-c: THEOM-DN42 -mnt-by: MONARCH-MNT -status: ASSIGNED -source: DN42 +inetnum: 172.23.203.0 - 172.23.203.63 +cidr: 172.23.203.0/26 +netname: MONARCH-NETWORK-01 +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +status: ASSIGNED +source: DN42 diff --git a/data/inetnum/172.23.203.64_26 b/data/inetnum/172.23.203.64_26 index 37aff6406..dfe454580 100644 --- a/data/inetnum/172.23.203.64_26 +++ b/data/inetnum/172.23.203.64_26 @@ -1,8 +1,8 @@ -inetnum: 172.23.203.64 - 172.23.203.127 -cidr: 172.23.203.64/26 -netname: MONARCH-NETWORK-02 -admin-c: THEOM-DN42 -tech-c: THEOM-DN42 -mnt-by: MONARCH-MNT -status: ASSIGNED -source: DN42 +inetnum: 172.23.203.64 - 172.23.203.127 +cidr: 172.23.203.64/26 +netname: MONARCH-NETWORK-02 +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +status: ASSIGNED +source: DN42 diff --git a/data/mntner/MONARCH-MNT b/data/mntner/MONARCH-MNT index 098da95a6..2605b8ead 100644 --- a/data/mntner/MONARCH-MNT +++ b/data/mntner/MONARCH-MNT @@ -1,7 +1,7 @@ -mntner: MONARCH-MNT -admin-c: THEOM-DN42 -tech-c: THEOM-DN42 -mnt-by: MONARCH-MNT -auth: pgp-fingerprint 2AEAB288F37BA3BD1918256D23FF2A5117DC7743 -auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJUxUKBiIYB2rG13JBeIpWVGRwaO4SdKN92frjsB0NoVwxqApbBg+W3jqpv2wu2ZodICeRPy+xJuU/G4YMKwD/d6wzZJsQlO8Ocm2M0PBbTi02ei55ur1VTcmFbxkouRFkvwyqJQ80SD0Ovv//rgWxI4y4sU0834RPI2SVpttJ5d9+JLzD86lsxy6WKn10kDJ6kocfq9WWPKMnNx7D8pQG27gpmpw+ClTAssXIt+N24IrS5yXtC3Zw2zCoteOLnECdrUZzLGIJ0NJshRsYvLQzkSyD4VEjJdrx43gS4gLt7mxQJ8yHmyEcU5C7WJhtrJAFS+SnOzfegQWVzGwiJYXB td512@td512.io -source: DN42 +mntner: MONARCH-MNT +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +auth: pgp-fingerprint 2AEAB288F37BA3BD1918256D23FF2A5117DC7743 +auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJUxUKBiIYB2rG13JBeIpWVGRwaO4SdKN92frjsB0NoVwxqApbBg+W3jqpv2wu2ZodICeRPy+xJuU/G4YMKwD/d6wzZJsQlO8Ocm2M0PBbTi02ei55ur1VTcmFbxkouRFkvwyqJQ80SD0Ovv//rgWxI4y4sU0834RPI2SVpttJ5d9+JLzD86lsxy6WKn10kDJ6kocfq9WWPKMnNx7D8pQG27gpmpw+ClTAssXIt+N24IrS5yXtC3Zw2zCoteOLnECdrUZzLGIJ0NJshRsYvLQzkSyD4VEjJdrx43gS4gLt7mxQJ8yHmyEcU5C7WJhtrJAFS+SnOzfegQWVzGwiJYXB td512@td512.io +source: DN42 diff --git a/data/organisation/ORG-MONARCH b/data/organisation/ORG-MONARCH index 5062f8517..b8a30e3e8 100644 --- a/data/organisation/ORG-MONARCH +++ b/data/organisation/ORG-MONARCH @@ -1,6 +1,6 @@ -organisation: ORG-MONARCH -org-name: Monarch Solutions, Inc. -admin-c: THEOM-DN42 -tech-c: THEOM-DN42 -mnt-by: MONARCH-MNT -source: DN42 +organisation: ORG-MONARCH +org-name: Monarch Solutions, Inc. +admin-c: THEOM-DN42 +tech-c: THEOM-DN42 +mnt-by: MONARCH-MNT +source: DN42 diff --git a/data/person/THEOM-DN42 b/data/person/THEOM-DN42 index 6d6feb345..ef5919de2 100644 --- a/data/person/THEOM-DN42 +++ b/data/person/THEOM-DN42 @@ -1,6 +1,6 @@ -person: Theo -contact: irc:TheoM@freenode -e-mail: theo@theom.nz -nic-hdl: THEOM-DN42 -mnt-by: MONARCH-MNT -source: DN42 +person: Theo +contact: irc:TheoM@freenode +e-mail: theo@theom.nz +nic-hdl: THEOM-DN42 +mnt-by: MONARCH-MNT +source: DN42 diff --git a/data/route/172.23.203.0_26 b/data/route/172.23.203.0_26 index 032919cac..15e865222 100644 --- a/data/route/172.23.203.0_26 +++ b/data/route/172.23.203.0_26 @@ -1,4 +1,4 @@ -route: 172.23.203.0/26 -origin: AS4242422376 -mnt-by: MONARCH-MNT -source: DN42 +route: 172.23.203.0/26 +origin: AS4242422376 +mnt-by: MONARCH-MNT +source: DN42 diff --git a/data/route/172.23.203.64_26 b/data/route/172.23.203.64_26 index fe3d11cd1..b8932c2ec 100644 --- a/data/route/172.23.203.64_26 +++ b/data/route/172.23.203.64_26 @@ -1,4 +1,4 @@ -route: 172.23.203.64/26 -origin: AS4242422377 -mnt-by: MONARCH-MNT -source: DN42 +route: 172.23.203.64/26 +origin: AS4242422377 +mnt-by: MONARCH-MNT +source: DN42