ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/rpc: Factor out load/dump json file into helper functions

Browse Source 
Change-Id: I31413a14ec81a84d454da4547ec02f69805cf05c
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/416303
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-06-21 10:45:00 +09:00 committed by Ben Walker
parent 2c52691b48
commit 93b78fc1e4
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scripts/rpc/__init__.py
View File

@ -29,6 +29,31 @@ def get_rpc_methods(client, args):
return client.call('get_rpc_methods', params) return client.call('get_rpc_methods', params)
def _json_dump(config, filename, indent):
if filename is None:
if indent is None:
indent = 2
elif indent < 0:
indent = None
json.dump(config, sys.stdout, indent=indent)
sys.stdout.write('\n')
else:
if indent is None or indent < 0:
indent = None
with open(filename, 'w') as file:
json.dump(config, file, indent=indent)
file.write('\n')
def _json_load(filename):
if not filename or filename == '-':
return json.load(sys.stdin)
else:
with open(filename, 'r') as file:
return json.load(file)
def save_config(client, args): def save_config(client, args):
config = { config = {
'subsystems': [] 'subsystems': []
@ -41,28 +66,11 @@ def save_config(client, args):
} }
config['subsystems'].append(cfg) config['subsystems'].append(cfg)
indent = args.indent _json_dump(config, args.filename, args.indent)
if args.filename is None:
if indent is None:
indent = 2
elif indent < 0:
indent = None
json.dump(config, sys.stdout, indent=indent)
sys.stdout.write('\n')
else:
if indent is None or indent < 0:
indent = None
with open(args.filename, 'w') as file:
json.dump(config, file, indent=indent)
file.write('\n')
def load_config(client, args): def load_config(client, args):
if not args.filename or args.filename == '-': json_config = _json_load(args.filename)
json_config = json.load(sys.stdin)
else:
with open(args.filename, 'r') as file:
json_config = json.load(file)
subsystems = json_config['subsystems'] subsystems = json_config['subsystems']
while subsystems: while subsystems:
@ -95,11 +103,7 @@ def load_config(client, args):
def load_subsystem_config(client, args): def load_subsystem_config(client, args):
if not args.filename or args.filename == '-': config = _json_load(args.filename)
config = json.load(sys.stdin)
else:
with open(args.filename, 'r') as file:
config = json.load(file)
for elem in config['config']: for elem in config['config']:
if not elem or 'method' not in elem: if not elem or 'method' not in elem: