mirror of
https://github.com/certat/intelmq-docker.git
synced 2025-12-06 09:12:49 +01:00
2.3 compatibility
This commit is contained in:
@@ -1,14 +1,18 @@
|
||||
import json
|
||||
from jsonmerge import merge
|
||||
import argparse
|
||||
from collections import OrderedDict
|
||||
|
||||
file1="/opt/dev/mybots/BOTS"
|
||||
file2="/opt/intelmq/intelmq/bots/BOTS"
|
||||
parser = argparse.ArgumentParser(description='Merge two json.')
|
||||
parser.add_argument('input_file_1', type=str, help='input_file_1')
|
||||
parser.add_argument('input_file_2', type=str, help='input_file_2')
|
||||
parser.add_argument('output_file', type=str, help='output_file')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
with open(file1, 'r') as f:
|
||||
with open(args.input_file_1, 'r') as f:
|
||||
j1 = json.load(f)
|
||||
with open(file2, 'r') as f:
|
||||
with open(args.input_file_2, 'r') as f:
|
||||
j2 = json.load(f)
|
||||
|
||||
def sortOD(od):
|
||||
@@ -26,8 +30,9 @@ merged = sortOD(merge(j1,j2))
|
||||
desired_order_list = ['Collector', 'Parser', 'Expert', 'Output']
|
||||
reordered_dict = {k: merged[k] for k in desired_order_list}
|
||||
|
||||
# add other keys
|
||||
reordered_dict.update({k: merged[k] for k in merged.keys() - desired_order_list})
|
||||
|
||||
with open(file2, 'w') as f:
|
||||
with open(args.output_file, 'w') as f:
|
||||
json.dump(reordered_dict, f, indent=4)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user