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

scripts/rpc: Support loading plugins in --server mode

Browse Source 
Put plugin parser into a separate function and use it to additionally
parse arguments passed to rpc.py via stdin.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I170d762ed9f5483d92b298f4804ee4e9f227a751
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7145
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2021-03-30 11:58:54 +02:00 committed by Tomasz Zawadzki
parent 31f8d52d13
commit 5ddb210e61
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/rpc.py
View File

@ -2650,20 +2650,26 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
print(ex.message) print(ex.message)
exit(1) exit(1)
# Create temporary parser, pull out the plugin parameter, load the module, and then run the real argument parser def load_plugin(args):
plugin_parser = argparse.ArgumentParser(add_help=False) # Create temporary parser, pull out the plugin parameter, load the module, and then run the real argument parser
plugin_parser.add_argument('--plugin', dest='rpc_plugin', help='Module name of plugin with additional RPC commands') plugin_parser = argparse.ArgumentParser(add_help=False)
plugin_parser.add_argument('--plugin', dest='rpc_plugin', help='Module name of plugin with additional RPC commands')
rpc_module = plugin_parser.parse_known_args()[0].rpc_plugin rpc_module = plugin_parser.parse_known_args()[0].rpc_plugin
if rpc_module is not None: if args is not None:
try: rpc_module = plugin_parser.parse_known_args(args)[0].rpc_plugin
rpc_plugin = importlib.import_module(rpc_module)
if rpc_module is not None:
try: try:
rpc_plugin.spdk_rpc_plugin_initialize(subparsers) rpc_plugin = importlib.import_module(rpc_module)
except AttributeError: try:
print("Module %s does not contain 'spdk_rpc_plugin_initialize' function" % rpc_module) rpc_plugin.spdk_rpc_plugin_initialize(subparsers)
except ModuleNotFoundError: except AttributeError:
print("Module %s not found" % rpc_module) print("Module %s does not contain 'spdk_rpc_plugin_initialize' function" % rpc_module)
except ModuleNotFoundError:
print("Module %s not found" % rpc_module)
load_plugin(None)
args = parser.parse_args() args = parser.parse_args()
@ -2675,6 +2681,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
for input in sys.stdin: for input in sys.stdin:
cmd = shlex.split(input) cmd = shlex.split(input)
try: try:
load_plugin(cmd)
tmp_args = parser.parse_args(cmd) tmp_args = parser.parse_args(cmd)
except SystemExit as ex: except SystemExit as ex:
print("**STATUS=1", flush=True) print("**STATUS=1", flush=True)