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

spdkcli: Skip refreshing node if spdkcli is run noninteractive

Browse Source 
Change-Id: I38662ce05acbf02092b1f02c72800aaf8f448136
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/445012
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Pawel Kaminski 2019-02-16 17:45:52 -05:00 committed by Jim Harris
parent e028ae45e2
commit 6a35d0fd13
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/spdkcli.py
View File

@ -32,6 +32,7 @@ def main():
:return: :return:
""" """
spdk_shell = ConfigShell("~/.scripts") spdk_shell = ConfigShell("~/.scripts")
spdk_shell.interactive = True
add_quotes_to_shell(spdk_shell) add_quotes_to_shell(spdk_shell)
parser = argparse.ArgumentParser(description="SPDK command line interface") parser = argparse.ArgumentParser(description="SPDK command line interface")
@ -51,6 +52,7 @@ def main():
if len(args.commands) > 0: if len(args.commands) > 0:
try: try:
spdk_shell.interactive = False
spdk_shell.run_cmdline(" ".join(args.commands)) spdk_shell.run_cmdline(" ".join(args.commands))
except Exception as e: except Exception as e:
sys.stderr.write("%s\n" % e) sys.stderr.write("%s\n" % e)

15
scripts/spdkcli/ui_node.py
View File

@ -43,13 +43,14 @@ class UINode(ConfigNode):
self.shell.log.debug("Command %s succeeded." % command) self.shell.log.debug("Command %s succeeded." % command)
return result return result
finally: finally:
if command in ["create", "delete", "delete_all", "add_initiator", if self.shell.interactive and\
"allow_any_host", "split_bdev", "add_lun", command in ["create", "delete", "delete_all", "add_initiator",
"add_pg_ig_maps", "remove_target", "add_secret", "allow_any_host", "split_bdev", "add_lun",
"destruct_split_bdev", "delete_pmem_pool", "add_pg_ig_maps", "remove_target", "add_secret",
"create_pmem_pool", "delete_secret_all", "destruct_split_bdev", "delete_pmem_pool",
"delete_initiator", "set_auth", "delete_secret", "create_pmem_pool", "delete_secret_all",
"delete_pg_ig_maps"]: "delete_initiator", "set_auth", "delete_secret",
"delete_pg_ig_maps"]:
self.get_root().refresh() self.get_root().refresh()
self.refresh_node() self.refresh_node()