From c76a1f41f1b43e4493b879ef9f9062cd4a429a6e Mon Sep 17 00:00:00 2001 From: Emil Skog Date: Sun, 12 Nov 2017 13:21:39 +0100 Subject: [PATCH 1/6] Added Mntner, Person, inetnum, autnum and routeobject for myself --- data/aut-num/AS4242420038 | 6 ++++++ data/inetnum/172.20.4.0_27 | 11 +++++++++++ data/mntner/SKOG-MNT | 5 +++++ data/person/ES-DN42 | 4 ++++ data/route/172.20.4.0_27 | 4 ++++ 5 files changed, 30 insertions(+) create mode 100644 data/aut-num/AS4242420038 create mode 100644 data/inetnum/172.20.4.0_27 create mode 100644 data/mntner/SKOG-MNT create mode 100644 data/person/ES-DN42 create mode 100644 data/route/172.20.4.0_27 diff --git a/data/aut-num/AS4242420038 b/data/aut-num/AS4242420038 new file mode 100644 index 000000000..cec188eb9 --- /dev/null +++ b/data/aut-num/AS4242420038 @@ -0,0 +1,6 @@ +aut-num: AS4242420038 +as-name: SKOGNET-AS +descr: Skog Network +admin-c: ES-DN42 +tech-c: ES-DN42 +mnt-by: SKOG-MNT diff --git a/data/inetnum/172.20.4.0_27 b/data/inetnum/172.20.4.0_27 new file mode 100644 index 000000000..6dcf9f5ee --- /dev/null +++ b/data/inetnum/172.20.4.0_27 @@ -0,0 +1,11 @@ +inetnum: 172.20.4.0-172.20.4.31 +netname: SKOGNET-AS +descr: Skog Network +country: SE +admin-c: ES-DN42 +tech-c: ES-DN42 +mnt-by: SKOG-MNT +nserver: SE +status: ALLOCATED +bgp-status: active +cidr: 172.20.4.0/27 diff --git a/data/mntner/SKOG-MNT b/data/mntner/SKOG-MNT new file mode 100644 index 000000000..041e22f35 --- /dev/null +++ b/data/mntner/SKOG-MNT @@ -0,0 +1,5 @@ +mntner: SKOG-MNT +sha512-pw: 3PwawxfYpc9P?z+Eb}7yQ9AKtyZ(64%]yDEjC+qJE988Q#3m{( +admin-c: ES-DN42 +tech-c: ES-DN42 +mnt-by: SKOG-MNT diff --git a/data/person/ES-DN42 b/data/person/ES-DN42 new file mode 100644 index 000000000..c1524b9bb --- /dev/null +++ b/data/person/ES-DN42 @@ -0,0 +1,4 @@ +person: Skog +contact: mail:eskog90@gmail.com +nic-hdl: ES-DN42 +mnt-by: SKOG-MNT diff --git a/data/route/172.20.4.0_27 b/data/route/172.20.4.0_27 new file mode 100644 index 000000000..b40a198d4 --- /dev/null +++ b/data/route/172.20.4.0_27 @@ -0,0 +1,4 @@ +route: 172.20.4.0/27 +origin: AS4242420038 +mnt-by: SKOG-MNT +bgp-status: active From 49366f3dcb86da73a78351e99782be28a92d928d Mon Sep 17 00:00:00 2001 From: Emil Skog Date: Sun, 12 Nov 2017 14:24:46 +0100 Subject: [PATCH 2/6] Corrected the status attribute for inetnum and removed incorrect nserver attribute. --- data/inetnum/172.20.4.0_27 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/inetnum/172.20.4.0_27 b/data/inetnum/172.20.4.0_27 index 6dcf9f5ee..02364a67c 100644 --- a/data/inetnum/172.20.4.0_27 +++ b/data/inetnum/172.20.4.0_27 @@ -5,7 +5,6 @@ country: SE admin-c: ES-DN42 tech-c: ES-DN42 mnt-by: SKOG-MNT -nserver: SE -status: ALLOCATED +status: ASSIGNED bgp-status: active cidr: 172.20.4.0/27 From e51bae86233faed7510a124591c70c01f79d8272 Mon Sep 17 00:00:00 2001 From: Pedro Palmeiro Date: Mon, 13 Nov 2017 16:46:19 +0000 Subject: [PATCH 3/6] Adding files for AS4242420138 --- data/aut-num/AS4242420138 | 6 ++++++ data/inetnum/172.20.58.128_27 | 8 ++++++++ data/mntner/HARDB1T-MNT | 6 ++++++ data/mntner/SKOG-MNT | 2 +- data/person/HARDB1T-DN42 | 5 +++++ data/route/172.20.58.128_27 | 4 ++++ 6 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 data/aut-num/AS4242420138 create mode 100644 data/inetnum/172.20.58.128_27 create mode 100644 data/mntner/HARDB1T-MNT create mode 100644 data/person/HARDB1T-DN42 create mode 100644 data/route/172.20.58.128_27 diff --git a/data/aut-num/AS4242420138 b/data/aut-num/AS4242420138 new file mode 100644 index 000000000..05457757e --- /dev/null +++ b/data/aut-num/AS4242420138 @@ -0,0 +1,6 @@ +aut-num: AS4242420138 +as-name: NEURONET-AS +descr: NEURONET Main Network +admin-c: HARDB1T-DN42 +tech-c: HARDB1T-DN42 +mnt-by: HARDB1T-MNT diff --git a/data/inetnum/172.20.58.128_27 b/data/inetnum/172.20.58.128_27 new file mode 100644 index 000000000..5cf225676 --- /dev/null +++ b/data/inetnum/172.20.58.128_27 @@ -0,0 +1,8 @@ +inetnum: 172.20.58.128-172.20.58.159 +netname: HARDB1T-AS +admin-c: HARDB1T-DN42 +tech-c: HARDB1T-DN42 +mnt-by: HARDB1T-MNT +status: ASSIGNED +bgp-status: active +cidr: 172.20.58.128/27 diff --git a/data/mntner/HARDB1T-MNT b/data/mntner/HARDB1T-MNT new file mode 100644 index 000000000..16f6a1eac --- /dev/null +++ b/data/mntner/HARDB1T-MNT @@ -0,0 +1,6 @@ +mntner: HARDB1T-MNT +sha512-pw: MDRmODM1NDZjNWQ1NDM5MTg4MmYzOGYxNTYzMTc1ZThkMDE2ZTAxNjE5OThjOTVkZWZkYTkzOWY2MWI0ODZiN2RlMzgzYzA1YWY5YzU5YzE3OWFiOTlmMDBjODZjYjRmNTA1NWUxOWNiOGJmMjlhZjg5M2JmNTYyZDk4NWNiMGRiY2E3YmJmZWNhODJhMGRjYjI4NWVmY2M0ZjU4NTZjMmU4MzViYmUyNjY4ZGVmMDJmZDkzMTljZmUwOTNlMjNlMTUyNzU0MWZmM2U2ODBiZWVjMDE0NDhmNGQxYTYyNDM5M2VlZDA1OTNlMjg0YTQ3MjZiNTA2NjFhMGJhOWJiNGYzMmJlMzhlOGNiN2M4N2M3MWM5MjYzMzkwMGY4NjU3ZjRlMjFhNzFiM2FjMDE5MzZjMWI5NDM0MWRmNDgwZTlmODBmODljMjAyN2JjNzQ2YWYzMDgwNTQ3N2ViZDQyYjZjNjBlYjYwMGIwNzQ5MjJmNTBhMWU1ZmJlMTY4Zjg4NjEwNTFiNzZmOGZmNDcxNjk0MzE4Y2UxZGY1ODcyY2E3YzEwNDdiZDVmOWI3NDg1YWI1ODRlMGJlMWRhNjk0MTM4ZmFkM2E0MzdmYjM5NjQ1YjNmMmFmZjljNjdmZmFiZTliZjNlODhkYzA1OGEzYjAxZGQ0MDk0NDZiZDc2Y2E= +descr: Hardb1t Maintenance Object +admin-c: HARDB1T-DN42 +tech-c: HARDB1T-DN42 +mnt-by: HARDB1T-MNT diff --git a/data/mntner/SKOG-MNT b/data/mntner/SKOG-MNT index 041e22f35..86acb42f6 100644 --- a/data/mntner/SKOG-MNT +++ b/data/mntner/SKOG-MNT @@ -1,5 +1,5 @@ mntner: SKOG-MNT -sha512-pw: 3PwawxfYpc9P?z+Eb}7yQ9AKtyZ(64%]yDEjC+qJE988Q#3m{( +sha512-pw: MmViZDg2MmFmNWNhZWUxYmI3NTExNjFiMDFhNzU3YTdhOThmNDYyZDFiOGQ5Nzc4ZmE1MjE0NWNiNjFmMWNiODZiZGE3MzQ5ODg5MmY2YWVkNmE3NGQyZTcyMWMxYWZjZTRkYWZhZWFiOTFhOTdjZTEyZDJhZmE3Y2MwZTEyNzYzYjU1OTZlNThjZWMyNDUyMGRlOGY2YTZjZTczNTRiOTRhNzk1MTg0NGY4N2MxOGVmYzY0ZDdjZWQ4NGIxMTRmNzBjMGRhMzExOTliZDUyM2Q5NmEyZDYzNTllMTFkZjhhODBhOTVhMjg4OWU2NDhlYTdiNDczOGM0ZTcxOWVkZjQ0YzM4MmIyZWU1MDI4YjE0OWU5ZjNlMTIzNDc1NTUzYTc0NjU1NDI5NDJhZmFjMjhmY2VmOTM3NzZhMzZkNmE2MDg5ZGVhMzBkM2Y4MjU1MmRhOWEzMmFlMDhlMzhhMjRkMGEzNzllMzBiMTliMDA3YjdjZWU0ZjZiNDc2NjQ4NGQyOTc1YTE5M2ZhYWI0NDIwY2ExYTkyYjgxMGU2NzkwOWUwNjU4M2YyNDEzMzc4NzBhZTc0ZjY2ZTNiNWMzMWViOWUyZjJjYjVhNDg5MGQ2ZGQ3ODRlOWQ4ZWExNTFmODIxY2YzNzYzNTg4NTZjMDMwMTljZDgzMTRhODQ2OTE= admin-c: ES-DN42 tech-c: ES-DN42 mnt-by: SKOG-MNT diff --git a/data/person/HARDB1T-DN42 b/data/person/HARDB1T-DN42 new file mode 100644 index 000000000..0090d5cef --- /dev/null +++ b/data/person/HARDB1T-DN42 @@ -0,0 +1,5 @@ +person: hardb1t +remarks: Hardb1t networks manager +contact: mail:pedropalmeiro@gmail.com +nic-hdl: HARDB1T-DN42 +mnt-by: HARDB1T-MNT diff --git a/data/route/172.20.58.128_27 b/data/route/172.20.58.128_27 new file mode 100644 index 000000000..3f4806474 --- /dev/null +++ b/data/route/172.20.58.128_27 @@ -0,0 +1,4 @@ +route: 172.20.58.128/27 +origin: AS4242420138 +mnt-by: HARDB1T-MNT +bgp-status: active From b1f9be9f77ef47911a6861b1c7df47a6fd1d8ce9 Mon Sep 17 00:00:00 2001 From: xuu Date: Mon, 13 Nov 2017 09:01:27 -0700 Subject: [PATCH 4/6] fix error in checking for mnt --- utils/schema-check/dn42-schema.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/schema-check/dn42-schema.py b/utils/schema-check/dn42-schema.py index 9995e2211..72883e5a5 100755 --- a/utils/schema-check/dn42-schema.py +++ b/utils/schema-check/dn42-schema.py @@ -463,6 +463,7 @@ def test_policy(obj_type, name, mntner): return "FAIL" lis = find(["mnt-by"], {"@type": obj_type, "@name": name}) + log.debug(lis) if len(lis) == 0: log.notice("%s does not currently exist" %(name)) @@ -471,11 +472,13 @@ def test_policy(obj_type, name, mntner): status = 'FAIL' for o in lis: for n in o: + log.debug(n) + log.debug(mntner) if n[0] == "mnt-by" and n[1] == mntner: status = 'PASS' - log.error("%s does not have mnt for object" %(mntner)) return status + log.error("%s does not have mnt for object" %(mntner)) return status elif args["type"] in ["inetnum","inet6num"]: From 57bb34e747c260674e0c0491b2717e73e48aef58 Mon Sep 17 00:00:00 2001 From: Gigadoc2 Date: Mon, 13 Nov 2017 09:53:56 +0100 Subject: [PATCH 5/6] add pgp key for GIGA-MNT --- data/mntner/GIGA-MNT | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mntner/GIGA-MNT b/data/mntner/GIGA-MNT index 8dce4b233..caa2cfdd5 100644 --- a/data/mntner/GIGA-MNT +++ b/data/mntner/GIGA-MNT @@ -2,6 +2,7 @@ mntner: GIGA-MNT sha512-pw: YzVjNmU1NDkzM2NkNTAxNWQ4OWE1MmY4MGY0N2Q5NmNhOWI4Y2ZmMmE2NmVkOTUxM2JmOTgzOTQwZDdjZDY5MzdiNjc0M2NkZTFlODUzNmU0MWU4Y2JmYWE4NGRjNzk5NWM4ZmZiNDRmNGZlZTNkMzZiYjBkNTIxYWE1NjU5NWJhNzM3ZWZiZWFmNTliNzg4YTZkZTQxMDVjMGQ5NDQyOTA2YWZiNzJhZmEwMDhkNzM1ODQwODYzNGU5NjQwNGIxNzU2OGQwNDgyZTVlM2ZlMDRkYjllOWVhNzkzNDZhYTk5ZTczOGYyMTQyYjcwMzdjMzhkY2IwOWU0NzAwNzQ0MDU5Y2M4MGRmNjcyMmZlMGEyMzRjMzRkMjM2MmJhZjBkNzYxMzQyODg0MmI4MmE5N2NkOTk3NTYyYmM4YTMxYmJkYmIyODRkMmRkNGE3OTI4NjdiNjgxNjRjM2Y3MzE4MTZkZmU0ZjY0YWE4NDM5YjY5YWMwZTFiZmZjYWFmOTllYjM1ODUwOTFmOWJmNDkyZGY2NWM5ZDk3YWUyMGM0YTMwZmY4NTI1OTBlMjlhZTE2YTUxMDEyZjFiYzAxNmVkYzc2YzQyN2FhZGIwOWJhM2E4ZDJlOGMyMDMzZTBkYmMwYTZlY2E1N2JjM2IzZTI3YzIwOTM5ZWRlZDkxNzUxOGQ= abuse-mailbox: abuse@revreso.de auth: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrfIeMFFayay0SXIgrG5couTJqC321Z2O6cxot+QC2AWb1ypleJ3NBHxjQ70XPxLkfC7X2VE2cLI4hy0TYidA8DM/+BGYhle1xofPhyvTp351p5QgEAOiCPlMLh8IU5VvlUq+CxD+UktT1YLtMbif2ugzbcRDUJrB6cyF1Pv1M6hlNEBAG1MBpHG2/XlrtlO54J0fCm00cU34Y50Ni+wG/h464xP92e5UYEY4ukNHqVGq0jmz7b0uge+uhp+omG/npLRDRFdkPMXyHMtqVUQgTHIAl4+qE73T/ZwToPfJg90+O3l2zH9Pixa2wii7LiktYMX2cfQNuxKR0ar0iqP/V gigadoc2 +auth: pgp-fingerprint B467666A0885B5BB5AF4ADE2294E289D422DE3FA admin-c: GIGA-DN42 tech-c: GIGA-DN42 mnt-by: GIGA-MNT From 3c988d02269771f7fcc0e03e37855b1763987f62 Mon Sep 17 00:00:00 2001 From: Gigadoc2 Date: Mon, 13 Nov 2017 09:59:31 +0100 Subject: [PATCH 6/6] resize 172.22.116.0/27 to 172.22.116.0/26 --- data/inetnum/{172.22.116.0_27 => 172.22.116.0_26} | 4 ++-- data/route/{172.22.116.0_27 => 172.22.116.0_26} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename data/inetnum/{172.22.116.0_27 => 172.22.116.0_26} (71%) rename data/route/{172.22.116.0_27 => 172.22.116.0_26} (79%) diff --git a/data/inetnum/172.22.116.0_27 b/data/inetnum/172.22.116.0_26 similarity index 71% rename from data/inetnum/172.22.116.0_27 rename to data/inetnum/172.22.116.0_26 index 51a497746..a51cbf462 100644 --- a/data/inetnum/172.22.116.0_27 +++ b/data/inetnum/172.22.116.0_26 @@ -1,4 +1,4 @@ -inetnum: 172.22.116.0 - 172.22.116.31 +inetnum: 172.22.116.0 - 172.22.116.63 netname: GIGA-IP4-NET country: DE admin-c: GIGA-DN42 @@ -6,4 +6,4 @@ tech-c: GIGA-DN42 mnt-by: GIGA-MNT status: ASSIGNED bgp-status: inactive 1497398404 -cidr: 172.22.116.0/27 +cidr: 172.22.116.0/26 diff --git a/data/route/172.22.116.0_27 b/data/route/172.22.116.0_26 similarity index 79% rename from data/route/172.22.116.0_27 rename to data/route/172.22.116.0_26 index 23d46a760..9dd83a9a2 100644 --- a/data/route/172.22.116.0_27 +++ b/data/route/172.22.116.0_26 @@ -1,4 +1,4 @@ -route: 172.22.116.0/27 +route: 172.22.116.0/26 descr: Gigadoc2 homenetwork origin: AS4242420003 mnt-by: GIGA-MNT