X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flnetctl.c;h=e6e4255aadca1769652dec0c3273aee5698af20d;hb=15020fd977af68620e862ad999eaab17688933e2;hp=969faedd0c8117ce212bc82847a491952affdc18;hpb=7a36afd9df713954426472214f9f986b60d1665b;p=fs%2Flustre-release.git

diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c
index 969faed..e6e4255 100644
--- a/lnet/utils/lnetctl.c
+++ b/lnet/utils/lnetctl.c
@@ -18,7 +18,7 @@
  *
  * LGPL HEADER END
  *
- * Copyright (c) 2014, 2016, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
  *
  * Author:
  *   Amir Shehata <amir.shehata@intel.com>
@@ -53,6 +53,9 @@ static int jt_set_tiny(int argc, char **argv);
 static int jt_set_small(int argc, char **argv);
 static int jt_set_large(int argc, char **argv);
 static int jt_set_numa(int argc, char **argv);
+static int jt_set_retry_count(int argc, char **argv);
+static int jt_set_transaction_to(int argc, char **argv);
+static int jt_set_hsensitivity(int argc, char **argv);
 static int jt_add_peer_nid(int argc, char **argv);
 static int jt_del_peer_nid(int argc, char **argv);
 static int jt_set_max_intf(int argc, char **argv);
@@ -60,6 +63,42 @@ static int jt_set_discovery(int argc, char **argv);
 static int jt_list_peer(int argc, char **argv);
 /*static int jt_show_peer(int argc, char **argv);*/
 static int lnetctl_list_commands(int argc, char **argv);
+static int jt_import(int argc, char **argv);
+static int jt_export(int argc, char **argv);
+static int jt_ping(int argc, char **argv);
+static int jt_discover(int argc, char **argv);
+static int jt_lnet(int argc, char **argv);
+static int jt_route(int argc, char **argv);
+static int jt_net(int argc, char **argv);
+static int jt_routing(int argc, char **argv);
+static int jt_set(int argc, char **argv);
+static int jt_stats(int argc, char **argv);
+static int jt_global(int argc, char **argv);
+static int jt_peers(int argc, char **argv);
+static int jt_set_ni_value(int argc, char **argv);
+static int jt_set_peer_ni_value(int argc, char **argv);
+
+command_t cmd_list[] = {
+	{"lnet", jt_lnet, 0, "lnet {configure | unconfigure} [--all]"},
+	{"route", jt_route, 0, "route {add | del | show | help}"},
+	{"net", jt_net, 0, "net {add | del | show | help}"},
+	{"routing", jt_routing, 0, "routing {show | help}"},
+	{"set", jt_set, 0, "set {tiny_buffers | small_buffers | large_buffers"
+			   " | routing | numa_range | max_interfaces"
+			   " | discovery}"},
+	{"import", jt_import, 0, "import FILE.yaml"},
+	{"export", jt_export, 0, "export FILE.yaml"},
+	{"stats", jt_stats, 0, "stats {show | help}"},
+	{"global", jt_global, 0, "global {show | help}"},
+	{"peer", jt_peers, 0, "peer {add | del | show | help}"},
+	{"ping", jt_ping, 0, "ping nid,[nid,...]"},
+	{"discover", jt_discover, 0, "discover nid[,nid,...]"},
+	{"help", Parser_help, 0, "help"},
+	{"exit", Parser_quit, 0, "quit"},
+	{"quit", Parser_quit, 0, "quit"},
+	{"--list-commands", lnetctl_list_commands, 0, "list commands"},
+	{ 0, 0, 0, NULL }
+};
 
 command_t lnet_cmds[] = {
 	{"configure", jt_config_lnet, 0, "configure lnet\n"
@@ -101,7 +140,12 @@ command_t net_cmds[] = {
 	 "\t--if: physical interface (e.g. eth0)\n"},
 	{"show", jt_show_net, 0, "show networks\n"
 	 "\t--net: net name (e.g. tcp0) to filter on\n"
-	 "\t--verbose: display detailed output per network\n"},
+	 "\t--verbose: display detailed output per network."
+		       " Optional argument of '2' outputs more stats\n"},
+	{"set", jt_set_ni_value, 0, "set local NI specific parameter\n"
+	 "\t--nid: NI NID to set the\n"
+	 "\t--health: specify health value to set\n"
+	 "\t--all: set all NIs value to the one specified\n"},
 	{ 0, 0, 0, NULL }
 };
 
@@ -138,6 +182,14 @@ command_t set_cmds[] = {
 	{"discovery", jt_set_discovery, 0, "enable/disable peer discovery\n"
 	 "\t0 - disable peer discovery\n"
 	 "\t1 - enable peer discovery (default)\n"},
+	{"retry_count", jt_set_retry_count, 0, "number of retries\n"
+	 "\t0 - turn of retries\n"
+	 "\t>0 - number of retries\n"},
+	{"transaction_timeout", jt_set_transaction_to, 0, "Message/Response timeout\n"
+	 "\t>0 - timeout in seconds\n"},
+	{"health_sensitivity", jt_set_hsensitivity, 0, "sensitivity to failure\n"
+	 "\t0 - turn off health evaluation\n"
+	 "\t>0 - sensitivity value not more than 1000\n"},
 	{ 0, 0, 0, NULL }
 };
 
@@ -147,15 +199,22 @@ command_t peer_cmds[] = {
 	 "\t            NID in the list becomes the Primary NID of a newly created\n"
 	 "\t            peer. \n"
 	 "\t--nid: one or more peer NIDs\n"
-	 "\t--non_mr: create this peer as not Multi-Rail capable\n"},
+	 "\t--non_mr: create this peer as not Multi-Rail capable\n"
+	 "\t--ip2nets: specify a range of nids per peer"},
 	{"del", jt_del_peer_nid, 0, "delete a peer NID\n"
 	 "\t--prim_nid: Primary NID of the peer.\n"
 	 "\t--nid: list of NIDs to remove. If none provided,\n"
-	 "\t       peer is deleted\n"},
+	 "\t       peer is deleted\n"
+	 "\t--ip2nets: specify a range of nids per peer"},
 	{"show", jt_show_peer, 0, "show peer information\n"
 	 "\t--nid: NID of peer to filter on.\n"
-	 "\t--verbose: Include  extended  statistics\n"},
+	 "\t--verbose: display detailed output per peer."
+		       " Optional argument of '2' outputs more stats\n"},
 	{"list", jt_list_peer, 0, "list all peers\n"},
+	{"set", jt_set_peer_ni_value, 0, "set peer ni specific parameter\n"
+	 "\t--nid: Peer NI NID to set the\n"
+	 "\t--health: specify health value to set\n"
+	 "\t--all: set all peer_nis values to the one specified\n"},
 	{ 0, 0, 0, NULL }
 };
 
@@ -181,6 +240,9 @@ static int parse_long(const char *number, long int *value)
 {
 	char *end;
 
+	if (!number)
+		return -1;
+
 	*value = strtol(number,  &end, 0);
 	if (end != NULL && *end != 0)
 		return -1;
@@ -188,11 +250,12 @@ static int parse_long(const char *number, long int *value)
 	return 0;
 }
 
-static int handle_help(const command_t *cmd_list, const char *cmd,
-		       const char *sub_cmd, int argc, char **argv)
+static int check_cmd(const command_t *cmd_list, const char *cmd,
+		     const char *sub_cmd, const int min_args,
+		     int argc, char **argv)
 {
 	int opt;
-	int rc = -1;
+	int rc = 0;
 	optind = 0;
 	opterr = 0;
 
@@ -202,19 +265,28 @@ static int handle_help(const command_t *cmd_list, const char *cmd,
 		{ .name = NULL }
 	};
 
+	if (argc < min_args) {
+		print_help(cmd_list, cmd, sub_cmd);
+		rc = -1;
+		goto out;
+	} else if (argc > 2) {
+		return 0;
+	}
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				  long_options, NULL)) != -1) {
 		switch (opt) {
 		case 'h':
 			print_help(cmd_list, cmd, sub_cmd);
-			rc = 0;
+			rc = 1;
 			break;
 		default:
-			rc = -1;
+			rc = 0;
 			break;
 		}
 	}
 
+out:
 	opterr = 1;
 	optind = 0;
 	return rc;
@@ -226,8 +298,9 @@ static int jt_set_max_intf(int argc, char **argv)
 	int rc;
 	struct cYAML *err_rc = NULL;
 
-	if (handle_help(set_cmds, "set", "max_interfaces", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", "max_interfaces", 2, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = parse_long(argv[1], &value);
 	if (rc != 0) {
@@ -253,8 +326,9 @@ static int jt_set_numa(int argc, char **argv)
 	int rc;
 	struct cYAML *err_rc = NULL;
 
-	if (handle_help(set_cmds, "set", "numa_range", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", "numa_range", 2, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = parse_long(argv[1], &value);
 	if (rc != 0) {
@@ -274,14 +348,99 @@ static int jt_set_numa(int argc, char **argv)
 	return rc;
 }
 
+static int jt_set_hsensitivity(int argc, char **argv)
+{
+	long int value;
+	int rc;
+	struct cYAML *err_rc = NULL;
+
+	rc = check_cmd(set_cmds, "set", "health_sensitivity", 2, argc, argv);
+	if (rc)
+		return rc;
+
+	rc = parse_long(argv[1], &value);
+	if (rc != 0) {
+		cYAML_build_error(-1, -1, "parser", "set",
+				  "cannot parse health sensitivity value", &err_rc);
+		cYAML_print_tree2file(stderr, err_rc);
+		cYAML_free_tree(err_rc);
+		return -1;
+	}
+
+	rc = lustre_lnet_config_hsensitivity(value, -1, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR)
+		cYAML_print_tree2file(stderr, err_rc);
+
+	cYAML_free_tree(err_rc);
+
+	return rc;
+}
+
+static int jt_set_transaction_to(int argc, char **argv)
+{
+	long int value;
+	int rc;
+	struct cYAML *err_rc = NULL;
+
+	rc = check_cmd(set_cmds, "set", "transaction_timeout", 2, argc, argv);
+	if (rc)
+		return rc;
+
+	rc = parse_long(argv[1], &value);
+	if (rc != 0) {
+		cYAML_build_error(-1, -1, "parser", "set",
+				  "cannot parse transaction timeout value", &err_rc);
+		cYAML_print_tree2file(stderr, err_rc);
+		cYAML_free_tree(err_rc);
+		return -1;
+	}
+
+	rc = lustre_lnet_config_transaction_to(value, -1, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR)
+		cYAML_print_tree2file(stderr, err_rc);
+
+	cYAML_free_tree(err_rc);
+
+	return rc;
+}
+
+static int jt_set_retry_count(int argc, char **argv)
+{
+	long int value;
+	int rc;
+	struct cYAML *err_rc = NULL;
+
+	rc = check_cmd(set_cmds, "set", "retry_count", 2, argc, argv);
+	if (rc)
+		return rc;
+
+	rc = parse_long(argv[1], &value);
+	if (rc != 0) {
+		cYAML_build_error(-1, -1, "parser", "set",
+				  "cannot parse retry_count value", &err_rc);
+		cYAML_print_tree2file(stderr, err_rc);
+		cYAML_free_tree(err_rc);
+		return -1;
+	}
+
+	rc = lustre_lnet_config_retry_count(value, -1, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR)
+		cYAML_print_tree2file(stderr, err_rc);
+
+	cYAML_free_tree(err_rc);
+
+	return rc;
+}
+
 static int jt_set_discovery(int argc, char **argv)
 {
 	long int value;
 	int rc;
 	struct cYAML *err_rc = NULL;
 
-	if (handle_help(set_cmds, "set", "discovery", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", "discovery", 2, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = parse_long(argv[1], &value);
 	if (rc != 0) {
@@ -307,8 +466,9 @@ static int jt_set_tiny(int argc, char **argv)
 	int rc;
 	struct cYAML *err_rc = NULL;
 
-	if (handle_help(set_cmds, "set", "tiny_buffers", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", "tiny_buffers", 2, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = parse_long(argv[1], &value);
 	if (rc != 0) {
@@ -334,8 +494,9 @@ static int jt_set_small(int argc, char **argv)
 	int rc;
 	struct cYAML *err_rc = NULL;
 
-	if (handle_help(set_cmds, "set", "small_buffers", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", "small_buffers", 2, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = parse_long(argv[1], &value);
 	if (rc != 0) {
@@ -361,8 +522,9 @@ static int jt_set_large(int argc, char **argv)
 	int rc;
 	struct cYAML *err_rc = NULL;
 
-	if (handle_help(set_cmds, "set", "large_buffers", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", "large_buffers", 2, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = parse_long(argv[1], &value);
 	if (rc != 0) {
@@ -388,8 +550,9 @@ static int jt_set_routing(int argc, char **argv)
 	struct cYAML *err_rc = NULL;
 	int rc;
 
-	if (handle_help(set_cmds, "set", "routing", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", "routing", 2, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = parse_long(argv[1], &value);
 	if (rc != 0 || (value != 0 && value != 1)) {
@@ -418,22 +581,22 @@ static int jt_config_lnet(int argc, char **argv)
 	bool load_mod_params = false;
 	int rc, opt;
 
-	const char *const short_options = "ah";
+	const char *const short_options = "a";
 	static const struct option long_options[] = {
 		{ .name = "all",  .has_arg = no_argument, .val = 'a' },
-		{ .name = "help", .has_arg = no_argument, .val = 'h' },
 		{ .name = NULL }
 	};
 
+	rc = check_cmd(lnet_cmds, "lnet", "configure", 0, argc, argv);
+	if (rc)
+		return rc;
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
 		case 'a':
 			load_mod_params = true;
 			break;
-		case 'h':
-			print_help(lnet_cmds, "lnet", "configure");
-			return 0;
 		default:
 			return 0;
 		}
@@ -455,8 +618,9 @@ static int jt_unconfig_lnet(int argc, char **argv)
 	struct cYAML *err_rc = NULL;
 	int rc;
 
-	if (handle_help(lnet_cmds, "lnet", "unconfigure", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(lnet_cmds, "lnet", "unconfigure", 0, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = lustre_lnet_config_ni_system(LNET_UNCONFIGURE, 0, -1, &err_rc);
 
@@ -474,15 +638,18 @@ static int jt_add_route(int argc, char **argv)
 	struct cYAML *err_rc = NULL;
 	int rc, opt;
 
-	const char *const short_options = "n:g:c:p:h";
+	const char *const short_options = "n:g:c:p:";
 	static const struct option long_options[] = {
 	{ .name = "net",       .has_arg = required_argument, .val = 'n' },
 	{ .name = "gateway",   .has_arg = required_argument, .val = 'g' },
 	{ .name = "hop-count", .has_arg = required_argument, .val = 'c' },
 	{ .name = "priority",  .has_arg = required_argument, .val = 'p' },
-	{ .name = "help",      .has_arg = no_argument,	     .val = 'h' },
 	{ .name = NULL } };
 
+	rc = check_cmd(route_cmds, "route", "add", 0, argc, argv);
+	if (rc)
+		return rc;
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
@@ -508,9 +675,6 @@ static int jt_add_route(int argc, char **argv)
 				continue;
 			}
 			break;
-		case 'h':
-			print_help(route_cmds, "route", "add");
-			return 0;
 		default:
 			return 0;
 		}
@@ -540,7 +704,7 @@ static int jt_add_ni(int argc, char **argv)
 	memset(&tunables, 0, sizeof(tunables));
 	lustre_lnet_init_nw_descr(&nw_descr);
 
-	const char *const short_options = "n:i:p:t:c:b:r:s:h";
+	const char *const short_options = "n:i:p:t:c:b:r:s:";
 	static const struct option long_options[] = {
 	{ .name = "net",	  .has_arg = required_argument, .val = 'n' },
 	{ .name = "if",		  .has_arg = required_argument, .val = 'i' },
@@ -551,9 +715,12 @@ static int jt_add_ni(int argc, char **argv)
 				  .has_arg = required_argument, .val = 'b' },
 	{ .name = "credits",	  .has_arg = required_argument, .val = 'r' },
 	{ .name = "cpt",	  .has_arg = required_argument, .val = 's' },
-	{ .name = "help",	  .has_arg = no_argument,	.val = 'h' },
 	{ .name = NULL } };
 
+	rc = check_cmd(net_cmds, "net", "add", 0, argc, argv);
+	if (rc)
+		return rc;
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
@@ -609,9 +776,6 @@ static int jt_add_ni(int argc, char **argv)
 						     strlen(optarg), 0,
 						     UINT_MAX, &global_cpts);
 			break;
-		case 'h':
-			print_help(net_cmds, "net", "add");
-			return 0;
 		default:
 			return 0;
 		}
@@ -648,13 +812,16 @@ static int jt_del_route(int argc, char **argv)
 	struct cYAML *err_rc = NULL;
 	int rc, opt;
 
-	const char *const short_options = "n:g:h";
+	const char *const short_options = "n:g:";
 	static const struct option long_options[] = {
 		{ .name = "net",     .has_arg = required_argument, .val = 'n' },
 		{ .name = "gateway", .has_arg = required_argument, .val = 'g' },
-		{ .name = "help",    .has_arg = no_argument,	   .val = 'h' },
 		{ .name = NULL } };
 
+	rc = check_cmd(route_cmds, "route", "del", 0, argc, argv);
+	if (rc)
+		return rc;
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
@@ -664,9 +831,6 @@ static int jt_del_route(int argc, char **argv)
 		case 'g':
 			gateway = optarg;
 			break;
-		case 'h':
-			print_help(route_cmds, "route", "del");
-			return 0;
 		default:
 			return 0;
 		}
@@ -690,13 +854,16 @@ static int jt_del_ni(int argc, char **argv)
 
 	lustre_lnet_init_nw_descr(&nw_descr);
 
-	const char *const short_options = "n:i:h";
+	const char *const short_options = "n:i:";
 	static const struct option long_options[] = {
 	{ .name = "net",	.has_arg = required_argument,	.val = 'n' },
 	{ .name = "if",		.has_arg = required_argument,	.val = 'i' },
-	{ .name = "help",	.has_arg = no_argument,		.val = 'h' },
 	{ .name = NULL } };
 
+	rc = check_cmd(net_cmds, "net", "del", 0, argc, argv);
+	if (rc)
+		return rc;
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
@@ -712,9 +879,6 @@ static int jt_del_ni(int argc, char **argv)
 				goto out;
 			}
 			break;
-		case 'h':
-			print_help(net_cmds, "net", "del");
-			return 0;
 		default:
 			return 0;
 		}
@@ -738,16 +902,19 @@ static int jt_show_route(int argc, char **argv)
 	int detail = 0, rc, opt;
 	struct cYAML *err_rc = NULL, *show_rc = NULL;
 
-	const char *const short_options = "n:g:h:p:vh";
+	const char *const short_options = "n:g:h:p:v";
 	static const struct option long_options[] = {
 	{ .name = "net",       .has_arg = required_argument, .val = 'n' },
 	{ .name = "gateway",   .has_arg = required_argument, .val = 'g' },
 	{ .name = "hop-count", .has_arg = required_argument, .val = 'c' },
 	{ .name = "priority",  .has_arg = required_argument, .val = 'p' },
 	{ .name = "verbose",   .has_arg = no_argument,	     .val = 'v' },
-	{ .name = "help",      .has_arg = no_argument,	     .val = 'h' },
 	{ .name = NULL } };
 
+	rc = check_cmd(route_cmds, "route", "show", 0, argc, argv);
+	if (rc)
+		return rc;
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
@@ -776,16 +943,13 @@ static int jt_show_route(int argc, char **argv)
 		case 'v':
 			detail = 1;
 			break;
-		case 'h':
-			print_help(route_cmds, "route", "show");
-			return 0;
 		default:
 			return 0;
 		}
 	}
 
 	rc = lustre_lnet_show_route(network, gateway, hop, prio, detail, -1,
-				    &show_rc, &err_rc);
+				    &show_rc, &err_rc, false);
 
 	if (rc != LUSTRE_CFG_RC_NO_ERR)
 		cYAML_print_tree2file(stderr, err_rc);
@@ -798,19 +962,80 @@ static int jt_show_route(int argc, char **argv)
 	return rc;
 }
 
+static int set_value_helper(int argc, char **argv,
+			    int (*cb)(int, bool, char*, int, struct cYAML**))
+{
+	char *nid = NULL;
+	long int healthv = -1;
+	bool all = false;
+	int rc, opt;
+	struct cYAML *err_rc = NULL;
+
+	const char *const short_options = "h:n:a";
+	static const struct option long_options[] = {
+		{ .name = "nid", .has_arg = required_argument, .val = 'n' },
+		{ .name = "health", .has_arg = required_argument, .val = 'h' },
+		{ .name = "all", .has_arg = no_argument, .val = 'a' },
+		{ .name = NULL } };
+
+	rc = check_cmd(net_cmds, "net", "set", 0, argc, argv);
+	if (rc)
+		return rc;
+
+	while ((opt = getopt_long(argc, argv, short_options,
+				   long_options, NULL)) != -1) {
+		switch (opt) {
+		case 'n':
+			nid = optarg;
+			break;
+		case 'h':
+			if (parse_long(argv[optind++], &healthv) != 0)
+				healthv = -1;
+			break;
+		case 'a':
+			all = true;
+		default:
+			return 0;
+		}
+	}
+
+	rc = cb(healthv, all, nid, -1, &err_rc);
+
+	if (rc != LUSTRE_CFG_RC_NO_ERR)
+		cYAML_print_tree2file(stderr, err_rc);
+
+	cYAML_free_tree(err_rc);
+
+	return rc;
+}
+
+static int jt_set_ni_value(int argc, char **argv)
+{
+	return set_value_helper(argc, argv, lustre_lnet_config_ni_healthv);
+}
+
+static int jt_set_peer_ni_value(int argc, char **argv)
+{
+	return set_value_helper(argc, argv, lustre_lnet_config_peer_ni_healthv);
+}
+
 static int jt_show_net(int argc, char **argv)
 {
 	char *network = NULL;
-	int detail = 0, rc, opt;
+	int rc, opt;
 	struct cYAML *err_rc = NULL, *show_rc = NULL;
+	long int detail = 0;
 
-	const char *const short_options = "n:vh";
+	const char *const short_options = "n:v";
 	static const struct option long_options[] = {
 		{ .name = "net",     .has_arg = required_argument, .val = 'n' },
-		{ .name = "verbose", .has_arg = no_argument,	   .val = 'v' },
-		{ .name = "help",    .has_arg = no_argument,	   .val = 'h' },
+		{ .name = "verbose", .has_arg = optional_argument, .val = 'v' },
 		{ .name = NULL } };
 
+	rc = check_cmd(net_cmds, "net", "show", 0, argc, argv);
+	if (rc)
+		return rc;
+
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
@@ -818,17 +1043,21 @@ static int jt_show_net(int argc, char **argv)
 			network = optarg;
 			break;
 		case 'v':
-			detail = 1;
+			if ((!optarg) && (argv[optind] != NULL) &&
+			    (argv[optind][0] != '-')) {
+				if (parse_long(argv[optind++], &detail) != 0)
+					detail = 1;
+			} else {
+				detail = 1;
+			}
 			break;
-		case 'h':
-			print_help(net_cmds, "net", "show");
-			return 0;
 		default:
 			return 0;
 		}
 	}
 
-	rc = lustre_lnet_show_net(network, detail, -1, &show_rc, &err_rc);
+	rc = lustre_lnet_show_net(network, (int) detail, -1, &show_rc, &err_rc,
+				  false);
 
 	if (rc != LUSTRE_CFG_RC_NO_ERR)
 		cYAML_print_tree2file(stderr, err_rc);
@@ -846,10 +1075,11 @@ static int jt_show_routing(int argc, char **argv)
 	struct cYAML *err_rc = NULL, *show_rc = NULL;
 	int rc;
 
-	if (handle_help(routing_cmds, "routing", "show", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(routing_cmds, "routing", "show", 0, argc, argv);
+	if (rc)
+		return rc;
 
-	rc = lustre_lnet_show_routing(-1, &show_rc, &err_rc);
+	rc = lustre_lnet_show_routing(-1, &show_rc, &err_rc, false);
 
 	if (rc != LUSTRE_CFG_RC_NO_ERR)
 		cYAML_print_tree2file(stderr, err_rc);
@@ -867,8 +1097,9 @@ static int jt_show_stats(int argc, char **argv)
 	int rc;
 	struct cYAML *show_rc = NULL, *err_rc = NULL;
 
-	if (handle_help(stats_cmds, "stats", "show", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(stats_cmds, "stats", "show", 0, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = lustre_lnet_show_stats(-1, &show_rc, &err_rc);
 
@@ -888,8 +1119,9 @@ static int jt_show_global(int argc, char **argv)
 	int rc;
 	struct cYAML *show_rc = NULL, *err_rc = NULL;
 
-	if (handle_help(global_cmds, "global", "show", argc, argv) == 0)
-		return 0;
+	rc = check_cmd(global_cmds, "global", "show", 0, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = lustre_lnet_show_numa_range(-1, &show_rc, &err_rc);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
@@ -909,6 +1141,24 @@ static int jt_show_global(int argc, char **argv)
 		goto out;
 	}
 
+	rc = lustre_lnet_show_retry_count(-1, &show_rc, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_print_tree2file(stderr, err_rc);
+		goto out;
+	}
+
+	rc = lustre_lnet_show_transaction_to(-1, &show_rc, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_print_tree2file(stderr, err_rc);
+		goto out;
+	}
+
+	rc = lustre_lnet_show_hsensitivity(-1, &show_rc, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_print_tree2file(stderr, err_rc);
+		goto out;
+	}
+
 	if (show_rc)
 		cYAML_print_tree(show_rc);
 
@@ -919,98 +1169,90 @@ out:
 	return rc;
 }
 
-static inline int jt_lnet(int argc, char **argv)
+static int jt_lnet(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2 &&
-	    handle_help(lnet_cmds, "lnet", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(lnet_cmds, "lnet", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], lnet_cmds);
 }
 
-static inline int jt_route(int argc, char **argv)
+static int jt_route(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2 &&
-	    handle_help(route_cmds, "route", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(route_cmds, "route", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], route_cmds);
 }
 
-static inline int jt_net(int argc, char **argv)
+static int jt_net(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2 &&
-	    handle_help(net_cmds, "net", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(net_cmds, "net", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], net_cmds);
 }
 
-static inline int jt_routing(int argc, char **argv)
+static int jt_routing(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2 &&
-	    handle_help(routing_cmds, "routing", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(routing_cmds, "routing", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], routing_cmds);
 }
 
-static inline int jt_stats(int argc, char **argv)
+static int jt_stats(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2 &&
-	    handle_help(stats_cmds, "stats", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(stats_cmds, "stats", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], stats_cmds);
 }
 
-static inline int jt_global(int argc, char **argv)
+static int jt_global(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2 &&
-	    handle_help(global_cmds, "global", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(global_cmds, "global", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], global_cmds);
 }
 
-static inline int jt_peers(int argc, char **argv)
+static int jt_peers(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2 &&
-	    handle_help(peer_cmds, "peer", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(peer_cmds, "peer", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], peer_cmds);
 }
 
-static inline int jt_set(int argc, char **argv)
+static int jt_set(int argc, char **argv)
 {
-	if (argc < 2)
-		return CMD_HELP;
+	int rc;
 
-	if (argc == 2  &&
-	    handle_help(set_cmds, "set", NULL, argc, argv) == 0)
-		return 0;
+	rc = check_cmd(set_cmds, "set", NULL, 2, argc, argv);
+	if (rc)
+		return rc;
 
 	return Parser_execarg(argc - 1, &argv[1], set_cmds);
 }
@@ -1023,7 +1265,7 @@ static int jt_import(int argc, char **argv)
 	int rc = 0, return_rc = 0, opt, opt_found = 0;
 	char cmd = 'a';
 
-	const char *const short_options = "adsh";
+	const char *const short_options = "adseh";
 	static const struct option long_options[] = {
 		{ .name = "add",  .has_arg = no_argument, .val = 'a' },
 		{ .name = "del",  .has_arg = no_argument, .val = 'd' },
@@ -1102,69 +1344,94 @@ static int jt_export(int argc, char **argv)
 {
 	struct cYAML *show_rc = NULL;
 	struct cYAML *err_rc = NULL;
-	int rc, opt;
+	int rc;
 	FILE *f = NULL;
+	int opt;
+	bool backup = false;
+	char *file = NULL;
 
-	const char *const short_options = "h";
+	const char *const short_options = "bh";
 	static const struct option long_options[] = {
+		{ .name = "backup", .has_arg = no_argument, .val = 'b' },
 		{ .name = "help", .has_arg = no_argument, .val = 'h' },
 		{ .name = NULL } };
 
 	while ((opt = getopt_long(argc, argv, short_options,
 				   long_options, NULL)) != -1) {
 		switch (opt) {
+		case 'b':
+			backup = true;
+			break;
 		case 'h':
-			printf("export FILE\n"
-			       "export > FILE : export configuration\n"
-			       "\t--help: display this help\n");
-			return 0;
 		default:
+			printf("export > FILE.yaml : export configuration\n"
+			       "\t--backup: export only what's necessary for reconfig\n"
+			       "\t--help: display this help\n");
 			return 0;
 		}
 	}
 
-	if (argc >= 2) {
-		f = fopen(argv[1], "w");
+	if (backup && argc >= 3)
+		file = argv[2];
+	else if (!backup && argc >= 2)
+		file = argv[1];
+	else
+		f = stdout;
+
+	if (file) {
+		f = fopen(file, "w");
 		if (f == NULL)
 			return -1;
-	} else
-		f = stdout;
+	}
 
-	rc = lustre_lnet_show_net(NULL, 1, -1, &show_rc, &err_rc);
+	rc = lustre_lnet_show_net(NULL, 2, -1, &show_rc, &err_rc, backup);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);
 		cYAML_free_tree(err_rc);
+		err_rc = NULL;
 	}
 
 	rc = lustre_lnet_show_route(NULL, NULL, -1, -1, 1, -1, &show_rc,
-				    &err_rc);
+				    &err_rc, backup);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);
 		cYAML_free_tree(err_rc);
+		err_rc = NULL;
 	}
 
-	rc = lustre_lnet_show_routing(-1, &show_rc, &err_rc);
+	rc = lustre_lnet_show_routing(-1, &show_rc, &err_rc, backup);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);
 		cYAML_free_tree(err_rc);
+		err_rc = NULL;
 	}
 
-	rc = lustre_lnet_show_peer(NULL, 1, -1, &show_rc, &err_rc);
+	rc = lustre_lnet_show_peer(NULL, 2, -1, &show_rc, &err_rc, backup);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);
 		cYAML_free_tree(err_rc);
+		err_rc = NULL;
 	}
 
 	rc = lustre_lnet_show_numa_range(-1, &show_rc, &err_rc);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);
 		cYAML_free_tree(err_rc);
+		err_rc = NULL;
 	}
 
 	rc = lustre_lnet_show_max_intf(-1, &show_rc, &err_rc);
 	if (rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_print_tree2file(stderr, err_rc);
 		cYAML_free_tree(err_rc);
+		err_rc = NULL;
+	}
+
+	rc = lustre_lnet_show_discovery(-1, &show_rc, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_print_tree2file(stderr, err_rc);
+		cYAML_free_tree(err_rc);
+		err_rc = NULL;
 	}
 
 	if (show_rc != NULL) {
@@ -1186,23 +1453,50 @@ static int jt_add_peer_nid(int argc, char **argv)
 	struct cYAML *err_rc = NULL;
 	int rc = LUSTRE_CFG_RC_NO_ERR, opt, i;
 	bool non_mr = false;
+	bool ip2nets = false, nid_list = false, prim_nid_present = false;
+
+	const char *const short_opts = "k:mn:";
+	const struct option long_opts[] = {
+	{ .name = "prim_nid",	.has_arg = required_argument,	.val = 'k' },
+	{ .name = "non_mr",	.has_arg = no_argument,		.val = 'm' },
+	{ .name = "nid",	.has_arg = required_argument,	.val = 'n' },
+	{ .name = "ip2nets",	.has_arg = required_argument,	.val = 'i' },
+	{ .name = NULL } };
 
-	const char *const short_options = "k:n:mh";
-	const struct option long_options[] = {
-		{ "prim_nid", 1, NULL, 'k' },
-		{ "nid", 1, NULL, 'n' },
-		{ "non_mr", 0, NULL, 'm'},
-		{ "help", 0, NULL, 'h' },
-		{ NULL, 0, NULL, 0 },
-	};
+	rc = check_cmd(peer_cmds, "peer", "add", 2, argc, argv);
+	if (rc)
+		return rc;
 
-	while ((opt = getopt_long(argc, argv, short_options,
-				  long_options, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, short_opts,
+				  long_opts, NULL)) != -1) {
 		switch (opt) {
 		case 'k':
+			prim_nid_present = true;
+			if (ip2nets) {
+				cYAML_build_error(-1, -1, "peer", "add",
+						"ip2nets can not be specified"
+						" along side prim_nid parameter.",
+						&err_rc);
+				goto failed;
+			}
 			prim_nid = optarg;
 			break;
+		case 'i':
 		case 'n':
+			if (opt == 'i')
+				ip2nets = true;
+
+			if (opt == 'n')
+				nid_list = true;
+
+			if (ip2nets && (nid_list || prim_nid_present)) {
+				cYAML_build_error(-1, -1, "peer", "add",
+						"ip2nets can not be specified"
+						" along side nid or prim_nid"
+						" parameters", &err_rc);
+				goto failed;
+			}
+
 			size = lustre_lnet_parse_nids(optarg, nids, size,
 						      &nids2);
 			if (nids2 == NULL)
@@ -1213,16 +1507,21 @@ static int jt_add_peer_nid(int argc, char **argv)
 		case 'm':
 			non_mr = true;
 			break;
-		case 'h':
-			print_help(peer_cmds, "peer", "add");
-			return 0;
 		default:
 			return 0;
 		}
 	}
 
+	for (; optind < argc; optind++) {
+		size = lustre_lnet_parse_nids(argv[optind], nids, size,
+						&nids2);
+		if (nids2 == NULL)
+			goto failed;
+		nids = nids2;
+	}
+
 	rc = lustre_lnet_config_peer_nid(prim_nid, nids, size,
-					 !non_mr, -1, &err_rc);
+					 !non_mr, ip2nets, -1, &err_rc);
 
 failed:
 	if (nids) {
@@ -1246,22 +1545,48 @@ static int jt_del_peer_nid(int argc, char **argv)
 	char **nids = NULL, **nids2 = NULL;
 	struct cYAML *err_rc = NULL;
 	int rc = LUSTRE_CFG_RC_NO_ERR, opt, i, size = 0;
+	bool ip2nets = false, nid_list = false, prim_nid_present = false;
 
-	const char *const short_options = "k:n:h";
-	const struct option long_options[] = {
-		{ "prim_nid", 1, NULL, 'k' },
-		{ "nid", 1, NULL, 'n' },
-		{ "help", 0, NULL, 'h' },
-		{ NULL, 0, NULL, 0 },
-	};
+	const char *const short_opts = "k:n:";
+	const struct option long_opts[] = {
+	{ .name = "prim_nid",	.has_arg = required_argument,	.val = 'k' },
+	{ .name = "nid",	.has_arg = required_argument,	.val = 'n' },
+	{ .name = "ip2nets",	.has_arg = required_argument,	.val = 'i' },
+	{ .name = NULL } };
 
-	while ((opt = getopt_long(argc, argv, short_options,
-				  long_options, NULL)) != -1) {
+	rc = check_cmd(peer_cmds, "peer", "del", 2, argc, argv);
+	if (rc)
+		return rc;
+
+	while ((opt = getopt_long(argc, argv, short_opts,
+				  long_opts, NULL)) != -1) {
 		switch (opt) {
 		case 'k':
+			prim_nid_present = true;
+			if (ip2nets) {
+				cYAML_build_error(-1, -1, "peer", "add",
+						"ip2nets can not be specified"
+						" along side prim_nid parameter.",
+						&err_rc);
+				goto failed;
+			}
 			prim_nid = optarg;
 			break;
+		case 'i':
 		case 'n':
+			if (opt == 'i')
+				ip2nets = true;
+
+			if (opt == 'n')
+				nid_list = true;
+
+			if (ip2nets && (nid_list || prim_nid_present)) {
+				cYAML_build_error(-1, -1, "peer", "add",
+						"ip2nets can not be specified"
+						" along side nid or prim_nid"
+						" parameters", &err_rc);
+				goto failed;
+			}
 			size = lustre_lnet_parse_nids(optarg, nids, size,
 						      &nids2);
 			if (nids2 == NULL)
@@ -1269,15 +1594,20 @@ static int jt_del_peer_nid(int argc, char **argv)
 			nids = nids2;
 			rc = LUSTRE_CFG_RC_OUT_OF_MEM;
 			break;
-		case 'h':
-			print_help(peer_cmds, "peer", "show");
-			return 0;
 		default:
 			return 0;
 		}
 	}
 
-	rc = lustre_lnet_del_peer_nid(prim_nid, nids, size, -1, &err_rc);
+	for (; optind < argc; optind++) {
+		size = lustre_lnet_parse_nids(argv[optind], nids, size,
+						&nids2);
+		if (nids2 == NULL)
+			goto failed;
+		nids = nids2;
+	}
+
+	rc = lustre_lnet_del_peer_nid(prim_nid, nids, size, ip2nets, -1, &err_rc);
 
 failed:
 	if (nids) {
@@ -1299,34 +1629,41 @@ static int jt_show_peer(int argc, char **argv)
 	char *nid = NULL;
 	int rc, opt;
 	struct cYAML *err_rc = NULL, *show_rc = NULL;
-	int detail = 0;
+	long int detail = 0;
 
-	const char *const short_options = "n:vh";
-	const struct option long_options[] = {
-		{ "nid", 1, NULL, 'n' },
-		{ "verbose", 0, NULL, 'v' },
-		{ "help", 0, NULL, 'h' },
-		{ NULL, 0, NULL, 0 },
-	};
+	const char *const short_opts = "hn:v::";
+	const struct option long_opts[] = {
+	{ .name = "help",	.has_arg = no_argument,		.val = 'h' },
+	{ .name = "nid",	.has_arg = required_argument,	.val = 'n' },
+	{ .name = "verbose",	.has_arg = optional_argument,	.val = 'v' },
+	{ .name = NULL } };
 
-	while ((opt = getopt_long(argc, argv, short_options,
-				  long_options, NULL)) != -1) {
+	rc = check_cmd(peer_cmds, "peer", "show", 1, argc, argv);
+	if (rc)
+		return rc;
+
+	while ((opt = getopt_long(argc, argv, short_opts,
+				  long_opts, NULL)) != -1) {
 		switch (opt) {
 		case 'n':
 			nid = optarg;
 			break;
 		case 'v':
-			detail = 1;
+			if ((!optarg) && (argv[optind] != NULL) &&
+			    (argv[optind][0] != '-')) {
+				if (parse_long(argv[optind++], &detail) != 0)
+					detail = 1;
+			} else {
+				detail = 1;
+			}
 			break;
-		case 'h':
-			print_help(peer_cmds, "peer", "show");
-			return 0;
 		default:
 			return 0;
 		}
 	}
 
-	rc = lustre_lnet_show_peer(nid, detail, -1, &show_rc, &err_rc);
+	rc = lustre_lnet_show_peer(nid, (int) detail, -1, &show_rc, &err_rc,
+				   false);
 
 	if (rc != LUSTRE_CFG_RC_NO_ERR)
 		cYAML_print_tree2file(stderr, err_rc);
@@ -1341,25 +1678,12 @@ static int jt_show_peer(int argc, char **argv)
 
 static int jt_list_peer(int argc, char **argv)
 {
-	int rc, opt;
+	int rc;
 	struct cYAML *err_rc = NULL, *list_rc = NULL;
 
-	const char *const short_options = "h";
-	const struct option long_options[] = {
-		{ "help", 0, NULL, 'h' },
-		{ NULL, 0, NULL, 0 },
-	};
-
-	while ((opt = getopt_long(argc, argv, short_options,
-				  long_options, NULL)) != -1) {
-		switch (opt) {
-		case 'h':
-			print_help(peer_cmds, "peer", "list");
-			return 0;
-		default:
-			return 0;
-		}
-	}
+	rc = check_cmd(peer_cmds, "peer", "list", 0, argc, argv);
+	if (rc)
+		return rc;
 
 	rc = lustre_lnet_list_peer(-1, &list_rc, &err_rc);
 
@@ -1381,12 +1705,11 @@ static int jt_ping(int argc, char **argv)
 	int timeout = 1000;
 	int rc = 0, opt;
 
-	const char *const short_options = "t:h";
+	const char *const short_options = "ht:";
 	const struct option long_options[] = {
-		{ "timeout", 1, NULL, 't' },
-		{ "help", 0, NULL, 'h' },
-		{ NULL, 0, NULL, 0 },
-	};
+	{ .name = "help",	.has_arg = no_argument,		.val = 'h' },
+	{ .name = "timeout",	.has_arg = required_argument,	.val = 't' },
+	{ .name = NULL } };
 
 	while ((opt = getopt_long(argc, argv, short_options,
 				  long_options, NULL)) != -1) {
@@ -1395,18 +1718,15 @@ static int jt_ping(int argc, char **argv)
 			timeout = 1000 * atol(optarg);
 			break;
 		case 'h':
-			printf("ping: <nid1> <nid2> .. <nidN> (e.g. 10.2.2.2@tcp)\n"
-			       "\t--timeout: timeout(secs)\n"
-			       "\t--help: display this help\n");
+			printf("ping nid[,nid,...]\n"
+			       "\t --timeout: ping timeout\n"
+			       "\t --help: display this help\n");
 			return 0;
 		default:
 			return 0;
 		}
 	}
 
-	if (argc < 2)
-		return CMD_HELP;
-
 	for (; optind < argc; optind++)
 		rc = lustre_lnet_ping_nid(argv[optind], timeout, -1, &show_rc, &err_rc);
 
@@ -1422,33 +1742,56 @@ static int jt_ping(int argc, char **argv)
 	return rc;
 }
 
-command_t list[] = {
-	{"lnet", jt_lnet, 0, "lnet {configure | unconfigure} [--all]"},
-	{"route", jt_route, 0, "route {add | del | show | help}"},
-	{"net", jt_net, 0, "net {add | del | show | help}"},
-	{"routing", jt_routing, 0, "routing {show | help}"},
-	{"set", jt_set, 0, "set {tiny_buffers | small_buffers | large_buffers"
-			   " | routing | numa_range | max_interfaces"
-			   " | discovery}"},
-	{"import", jt_import, 0, "import {--add | --del | --show | "
-				 "--exec | --help} FILE.yaml"},
-	{"export", jt_export, 0, "export {--help} FILE.yaml"},
-	{"stats", jt_stats, 0, "stats {show | help}"},
-	{"global", jt_global, 0, "global {show | help}"},
-	{"peer", jt_peers, 0, "peer {add | del | show | help}"},
-	{"ping", jt_ping, 0, "ping {--help}"},
-	{"help", Parser_help, 0, "help"},
-	{"exit", Parser_quit, 0, "quit"},
-	{"quit", Parser_quit, 0, "quit"},
-	{"--list-commands", lnetctl_list_commands, 0, "list commands"},
-	{ 0, 0, 0, NULL }
-};
+static int jt_discover(int argc, char **argv)
+{
+	struct cYAML *err_rc = NULL;
+	struct cYAML *show_rc = NULL;
+	int force = 0;
+	int rc = 0, opt;
+
+	const char *const short_options = "fh";
+	const struct option long_options[] = {
+		{ .name = "force",	.has_arg = no_argument,	.val = 'f' },
+		{ .name = "help",	.has_arg = no_argument,	.val = 'h' },
+		{ .name = NULL } };
+
+	while ((opt = getopt_long(argc, argv, short_options,
+				  long_options, NULL)) != -1) {
+		switch (opt) {
+		case 'f':
+			force = 1;
+			break;
+		case 'h':
+			printf("discover nid[,nid,...]\n"
+			       "\t --force: force discovery\n"
+			       "\t --help: display this help\n");
+			return 0;
+		default:
+			return 0;
+		}
+	}
+
+	for (; optind < argc; optind++)
+		rc = lustre_lnet_discover_nid(argv[optind], force, -1, &show_rc,
+					      &err_rc);
+
+	if (show_rc)
+		cYAML_print_tree(show_rc);
+
+	if (err_rc)
+		cYAML_print_tree2file(stderr, err_rc);
+
+	cYAML_free_tree(err_rc);
+	cYAML_free_tree(show_rc);
+
+	return rc;
+}
 
 static int lnetctl_list_commands(int argc, char **argv)
 {
 	char buffer[81] = ""; /* 80 printable chars + terminating NUL */
 
-	Parser_list_commands(list, buffer, sizeof(buffer), NULL, 0, 4);
+	Parser_list_commands(cmd_list, buffer, sizeof(buffer), NULL, 0, 4);
 
 	return 0;
 }
@@ -1466,9 +1809,9 @@ int main(int argc, char **argv)
 		return rc;
 	}
 
-	Parser_init("lnetctl > ", list);
+	Parser_init("lnetctl > ", cmd_list);
 	if (argc > 1) {
-		rc = Parser_execarg(argc - 1, &argv[1], list);
+		rc = Parser_execarg(argc - 1, &argv[1], cmd_list);
 		goto errorout;
 	}