sync/NeoNetwork
1
0
Fork 0
mirror of https://github.com/NeoCloud/NeoNetwork synced 2024-11-23 00:40:41 +08:00
Code Issues Releases Wiki Activity

adjust json format

Browse source
This commit is contained in:
JerryXiao 2020-05-01 15:45:25 +08:00
parent 823702e1b4
commit 83f98d7285
Signed by: Jerry
GPG key ID: 9D9CE43650FF2BAA
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/roa.yml vendored
View file

@ -5,6 +5,8 @@ name: roa_generator
on: on:
push: push:
branches: [ master ] branches: [ master ]
schedule:
- cron: '0 6 * * 1'
jobs: jobs:
build: build:

13
scripts/roa.py
View file

@ -70,7 +70,7 @@ def route2roa(dirname, is_ipv6=False):
if __name__ == "__main__": if __name__ == "__main__":
import argparse import argparse
parser = argparse.ArgumentParser(description='NeoNetwork ROA tool') parser = argparse.ArgumentParser(description='NeoNetwork ROA tool')
parser.add_argument('-m', '--max', type=int, default=30, help='set ipv4 max prefix length') parser.add_argument('-m', '--max', type=int, default=29, help='set ipv4 max prefix length')
parser.add_argument('-M', '--max6', type=int, default=64, help='set ipv6 max prefix length') parser.add_argument('-M', '--max6', type=int, default=64, help='set ipv6 max prefix length')
parser.add_argument('-j', '--json', action='store_true', help='output json') parser.add_argument('-j', '--json', action='store_true', help='output json')
parser.add_argument('-o', '--output', default='', help='write output to file') parser.add_argument('-o', '--output', default='', help='write output to file')
@ -104,12 +104,15 @@ if __name__ == "__main__":
output = "" output = ""
if args.json: if args.json:
import json import json, time
d_output = dict() for r in (*roa4, *roa6):
r[0] = "AS%d" % r[0]
current = int(time.time())
d_output = {"metadata": {"counts": len(roa4)+len(roa6), "generated": current, "valid": current+14*86400}, "roas": list()}
for r in roa4: for r in roa4:
d_output.setdefault('ipv4', list()).append(dict(zip(['asn', 'prefix', 'max'], r))) d_output['roas'].append(dict(zip(['asn', 'prefix', 'maxLength'], r)))
for r in roa6: for r in roa6:
d_output.setdefault('ipv6', list()).append(dict(zip(['asn', 'prefix', 'max'], r))) d_output['roas'].append(dict(zip(['asn', 'prefix', 'maxLength'], r)))
output = json.dumps(d_output, indent=2) output = json.dumps(d_output, indent=2)
else: else:
output += "# NeoNetwork ROA tool\n" output += "# NeoNetwork ROA tool\n"