diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build-command-op-templates | 2 | ||||
-rwxr-xr-x | scripts/build-command-templates | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/build-command-op-templates b/scripts/build-command-op-templates index 0383c8982..689d19ece 100755 --- a/scripts/build-command-op-templates +++ b/scripts/build-command-op-templates @@ -111,7 +111,7 @@ def get_properties(p): for i in lists: comp_exprs.append("echo \"{0}\"".format(i.text)) for i in paths: - comp_exprs.append("/bin/cli-shell-api listNodes {0}".format(i.text)) + comp_exprs.append("/bin/cli-shell-api listActiveNodes {0} | sed -e \"s/'//g\"".format(i.text)) for i in scripts: comp_exprs.append("{0}".format(i.text)) comp_help = " && ".join(comp_exprs) diff --git a/scripts/build-command-templates b/scripts/build-command-templates index dbf4ad9c5..c6534a6d8 100755 --- a/scripts/build-command-templates +++ b/scripts/build-command-templates @@ -264,6 +264,11 @@ def process_node(n, tmpl_dir): if node_type == "tagNode": props["tag"] = "True" + if node_type != "leafNode": + if "multi" in props: + raise ValueError("<multi/> tag is only allowed in <leafNode>") + if "valueless" in props: + raise ValueError("<valueless/> is only allowed in <leafNode>") nodedef_path = os.path.join(make_path(my_tmpl_dir), "node.def") if not os.path.exists(nodedef_path): |