diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index 595f0a776..cbd908feb 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -64,7 +64,6 @@ rpc_iscsi_get_initiator_groups(struct spdk_jsonrpc_request *request, } SPDK_RPC_REGISTER("iscsi_get_initiator_groups", rpc_iscsi_get_initiator_groups, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_initiator_groups, get_initiator_groups) struct rpc_initiator_list { size_t num_initiators; @@ -170,7 +169,6 @@ invalid: } SPDK_RPC_REGISTER("iscsi_create_initiator_group", rpc_iscsi_create_initiator_group, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_initiator_group, add_initiator_group) static const struct spdk_json_object_decoder rpc_add_or_delete_initiators_decoders[] = { {"tag", offsetof(struct rpc_initiator_group, tag), spdk_json_decode_int32}, @@ -210,8 +208,6 @@ invalid: } SPDK_RPC_REGISTER("iscsi_initiator_group_add_initiators", rpc_iscsi_initiator_group_add_initiators, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_initiator_group_add_initiators, - add_initiators_to_initiator_group) static void rpc_iscsi_initiator_group_remove_initiators(struct spdk_jsonrpc_request *request, @@ -245,8 +241,6 @@ invalid: } SPDK_RPC_REGISTER("iscsi_initiator_group_remove_initiators", rpc_iscsi_initiator_group_remove_initiators, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_initiator_group_remove_initiators, - delete_initiators_from_initiator_group) struct rpc_iscsi_delete_initiator_group { int32_t tag; @@ -285,7 +279,6 @@ invalid: } SPDK_RPC_REGISTER("iscsi_delete_initiator_group", rpc_iscsi_delete_initiator_group, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_initiator_group, delete_initiator_group) static void rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request, @@ -307,7 +300,6 @@ rpc_iscsi_get_target_nodes(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } SPDK_RPC_REGISTER("iscsi_get_target_nodes", rpc_iscsi_get_target_nodes, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_target_nodes, get_target_nodes) struct rpc_pg_ig_map { int32_t pg_tag; @@ -491,7 +483,6 @@ invalid: free_rpc_target_node(&req); } SPDK_RPC_REGISTER("iscsi_create_target_node", rpc_iscsi_create_target_node, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_target_node, construct_target_node) struct rpc_tgt_node_pg_ig_maps { char *name; @@ -550,7 +541,6 @@ invalid: } SPDK_RPC_REGISTER("iscsi_target_node_add_pg_ig_maps", rpc_iscsi_target_node_add_pg_ig_maps, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_add_pg_ig_maps, add_pg_ig_maps) static void rpc_iscsi_target_node_remove_pg_ig_maps(struct spdk_jsonrpc_request *request, @@ -599,8 +589,6 @@ invalid: } SPDK_RPC_REGISTER("iscsi_target_node_remove_pg_ig_maps", rpc_iscsi_target_node_remove_pg_ig_maps, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_remove_pg_ig_maps, - delete_pg_ig_maps) struct rpc_iscsi_delete_target_node { char *name; @@ -668,7 +656,6 @@ invalid: free(ctx); } SPDK_RPC_REGISTER("iscsi_delete_target_node", rpc_iscsi_delete_target_node, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_target_node, delete_target_node) static void rpc_iscsi_get_portal_groups(struct spdk_jsonrpc_request *request, @@ -690,7 +677,6 @@ rpc_iscsi_get_portal_groups(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } SPDK_RPC_REGISTER("iscsi_get_portal_groups", rpc_iscsi_get_portal_groups, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_portal_groups, get_portal_groups) struct rpc_portal { char *host; @@ -820,7 +806,6 @@ out: free_rpc_portal_group(&req); } SPDK_RPC_REGISTER("iscsi_create_portal_group", rpc_iscsi_create_portal_group, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_portal_group, add_portal_group) struct rpc_iscsi_change_portal_group { int32_t tag; @@ -881,7 +866,6 @@ rpc_iscsi_delete_portal_group(struct spdk_jsonrpc_request *request, _rpc_iscsi_change_portal_group(request, params, _rpc_iscsi_delete_portal_group); } SPDK_RPC_REGISTER("iscsi_delete_portal_group", rpc_iscsi_delete_portal_group, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_portal_group, delete_portal_group) static int _rpc_iscsi_start_portal_group(int pg_tag) @@ -1026,7 +1010,6 @@ rpc_iscsi_get_connections(struct spdk_jsonrpc_request *request, _rpc_iscsi_get_connections_done); } SPDK_RPC_REGISTER("iscsi_get_connections", rpc_iscsi_get_connections, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_connections, get_iscsi_connections) struct rpc_target_lun { char *name; @@ -1086,7 +1069,6 @@ invalid: free_rpc_target_lun(&req); } SPDK_RPC_REGISTER("iscsi_target_node_add_lun", rpc_iscsi_target_node_add_lun, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_add_lun, target_node_add_lun) struct rpc_target_auth { char *name; @@ -1151,7 +1133,6 @@ exit: } SPDK_RPC_REGISTER("iscsi_target_node_set_auth", rpc_iscsi_target_node_set_auth, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_set_auth, set_iscsi_target_node_auth) struct rpc_target_redirect { char *name; @@ -1293,7 +1274,6 @@ rpc_iscsi_get_options(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } SPDK_RPC_REGISTER("iscsi_get_options", rpc_iscsi_get_options, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_options, get_iscsi_global_params) struct rpc_discovery_auth { bool disable_chap; @@ -1335,7 +1315,6 @@ rpc_iscsi_set_discovery_auth(struct spdk_jsonrpc_request *request, spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_set_discovery_auth", rpc_iscsi_set_discovery_auth, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_set_discovery_auth, set_iscsi_discovery_auth) #define MAX_AUTH_SECRETS 64 @@ -1467,7 +1446,6 @@ rpc_iscsi_create_auth_group(struct spdk_jsonrpc_request *request, spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_create_auth_group", rpc_iscsi_create_auth_group, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_auth_group, add_iscsi_auth_group) struct rpc_delete_auth_group { int32_t tag; @@ -1510,7 +1488,6 @@ rpc_iscsi_delete_auth_group(struct spdk_jsonrpc_request *request, spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_delete_auth_group", rpc_iscsi_delete_auth_group, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_auth_group, delete_iscsi_auth_group) struct rpc_add_auth_secret { int32_t tag; @@ -1585,7 +1562,6 @@ rpc_iscsi_auth_group_add_secret(struct spdk_jsonrpc_request *request, } SPDK_RPC_REGISTER("iscsi_auth_group_add_secret", rpc_iscsi_auth_group_add_secret, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_auth_group_add_secret, add_secret_to_iscsi_auth_group) struct rpc_remove_auth_secret { @@ -1652,8 +1628,6 @@ rpc_iscsi_auth_group_remove_secret(struct spdk_jsonrpc_request *request, } SPDK_RPC_REGISTER("iscsi_auth_group_remove_secret", rpc_iscsi_auth_group_remove_secret, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_auth_group_remove_secret, - delete_secret_from_iscsi_auth_group) static void rpc_iscsi_get_auth_groups(struct spdk_jsonrpc_request *request, @@ -1675,7 +1649,6 @@ rpc_iscsi_get_auth_groups(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } SPDK_RPC_REGISTER("iscsi_get_auth_groups", rpc_iscsi_get_auth_groups, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_get_auth_groups, get_iscsi_auth_groups) static const struct spdk_json_object_decoder rpc_set_iscsi_opts_decoders[] = { {"auth_file", offsetof(struct spdk_iscsi_opts, authfile), spdk_json_decode_string, true}, @@ -1751,4 +1724,3 @@ rpc_iscsi_set_options(struct spdk_jsonrpc_request *request, spdk_jsonrpc_send_bool_response(request, true); } SPDK_RPC_REGISTER("iscsi_set_options", rpc_iscsi_set_options, SPDK_RPC_STARTUP) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_set_options, set_iscsi_options) diff --git a/lib/scsi/scsi_rpc.c b/lib/scsi/scsi_rpc.c index 1938ddac7..8454959cf 100644 --- a/lib/scsi/scsi_rpc.c +++ b/lib/scsi/scsi_rpc.c @@ -74,4 +74,3 @@ rpc_scsi_get_devices(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } SPDK_RPC_REGISTER("scsi_get_devices", rpc_scsi_get_devices, SPDK_RPC_RUNTIME) -SPDK_RPC_REGISTER_ALIAS_DEPRECATED(scsi_get_devices, get_scsi_devices) diff --git a/python/spdk/rpc/iscsi.py b/python/spdk/rpc/iscsi.py index 9e212e8eb..3d6c2d5da 100644 --- a/python/spdk/rpc/iscsi.py +++ b/python/spdk/rpc/iscsi.py @@ -1,7 +1,6 @@ from .helpers import deprecated_alias -@deprecated_alias('set_iscsi_options') def iscsi_set_options( client, auth_file=None, @@ -105,7 +104,6 @@ def iscsi_set_options( return client.call('iscsi_set_options', params) -@deprecated_alias('set_iscsi_discovery_auth') def iscsi_set_discovery_auth( client, disable_chap=None, @@ -137,7 +135,6 @@ def iscsi_set_discovery_auth( return client.call('iscsi_set_discovery_auth', params) -@deprecated_alias('get_iscsi_auth_groups') def iscsi_get_auth_groups(client): """Display current authentication group configuration. @@ -147,7 +144,6 @@ def iscsi_get_auth_groups(client): return client.call('iscsi_get_auth_groups') -@deprecated_alias('get_portal_groups') def iscsi_get_portal_groups(client): """Display current portal group configuration. @@ -157,7 +153,6 @@ def iscsi_get_portal_groups(client): return client.call('iscsi_get_portal_groups') -@deprecated_alias('get_initiator_groups') def iscsi_get_initiator_groups(client): """Display current initiator group configuration. @@ -167,7 +162,6 @@ def iscsi_get_initiator_groups(client): return client.call('iscsi_get_initiator_groups') -@deprecated_alias('get_target_nodes') def iscsi_get_target_nodes(client): """Display target nodes. @@ -177,7 +171,6 @@ def iscsi_get_target_nodes(client): return client.call('iscsi_get_target_nodes') -@deprecated_alias('construct_target_node') def iscsi_create_target_node( client, luns, @@ -232,7 +225,6 @@ def iscsi_create_target_node( return client.call('iscsi_create_target_node', params) -@deprecated_alias('target_node_add_lun') def iscsi_target_node_add_lun(client, name, bdev_name, lun_id=None): """Add LUN to the target node. @@ -253,7 +245,6 @@ def iscsi_target_node_add_lun(client, name, bdev_name, lun_id=None): return client.call('iscsi_target_node_add_lun', params) -@deprecated_alias('set_iscsi_target_node_auth') def iscsi_target_node_set_auth( client, name, @@ -288,7 +279,6 @@ def iscsi_target_node_set_auth( return client.call('iscsi_target_node_set_auth', params) -@deprecated_alias('add_iscsi_auth_group') def iscsi_create_auth_group(client, tag, secrets=None): """Create authentication group for CHAP authentication. @@ -306,7 +296,6 @@ def iscsi_create_auth_group(client, tag, secrets=None): return client.call('iscsi_create_auth_group', params) -@deprecated_alias('delete_iscsi_auth_group') def iscsi_delete_auth_group(client, tag): """Delete an authentication group. @@ -320,7 +309,6 @@ def iscsi_delete_auth_group(client, tag): return client.call('iscsi_delete_auth_group', params) -@deprecated_alias('add_secret_to_iscsi_auth_group') def iscsi_auth_group_add_secret(client, tag, user, secret, muser=None, msecret=None): """Add a secret to an authentication group. @@ -343,7 +331,6 @@ def iscsi_auth_group_add_secret(client, tag, user, secret, muser=None, msecret=N return client.call('iscsi_auth_group_add_secret', params) -@deprecated_alias('delete_secret_from_iscsi_auth_group') def iscsi_auth_group_remove_secret(client, tag, user): """Remove a secret from an authentication group. @@ -358,7 +345,6 @@ def iscsi_auth_group_remove_secret(client, tag, user): return client.call('iscsi_auth_group_remove_secret', params) -@deprecated_alias('delete_pg_ig_maps') def iscsi_target_node_remove_pg_ig_maps(client, pg_ig_maps, name): """Delete PG-IG maps from the target node. @@ -376,7 +362,6 @@ def iscsi_target_node_remove_pg_ig_maps(client, pg_ig_maps, name): return client.call('iscsi_target_node_remove_pg_ig_maps', params) -@deprecated_alias('add_pg_ig_maps') def iscsi_target_node_add_pg_ig_maps(client, pg_ig_maps, name): """Add PG-IG maps to the target node. @@ -435,7 +420,6 @@ def iscsi_target_node_request_logout(client, name, pg_tag): return client.call('iscsi_target_node_request_logout', params) -@deprecated_alias('add_portal_group') def iscsi_create_portal_group(client, portals, tag, private, wait): """Add a portal group. @@ -470,7 +454,6 @@ def iscsi_start_portal_group(client, tag): return client.call('iscsi_start_portal_group', params) -@deprecated_alias('add_initiator_group') def iscsi_create_initiator_group(client, tag, initiators, netmasks): """Add an initiator group. @@ -487,7 +470,6 @@ def iscsi_create_initiator_group(client, tag, initiators, netmasks): return client.call('iscsi_create_initiator_group', params) -@deprecated_alias('add_initiators_to_initiator_group') def iscsi_initiator_group_add_initiators( client, tag, @@ -513,7 +495,6 @@ def iscsi_initiator_group_add_initiators( return client.call('iscsi_initiator_group_add_initiators', params) -@deprecated_alias('delete_initiators_from_initiator_group') def iscsi_initiator_group_remove_initiators( client, tag, initiators=None, netmasks=None): """Delete initiators from an existing initiator group. @@ -535,7 +516,6 @@ def iscsi_initiator_group_remove_initiators( return client.call('iscsi_initiator_group_remove_initiators', params) -@deprecated_alias('delete_target_node') def iscsi_delete_target_node(client, target_node_name): """Delete a target node. @@ -549,7 +529,6 @@ def iscsi_delete_target_node(client, target_node_name): return client.call('iscsi_delete_target_node', params) -@deprecated_alias('delete_portal_group') def iscsi_delete_portal_group(client, tag): """Delete a portal group. @@ -563,7 +542,6 @@ def iscsi_delete_portal_group(client, tag): return client.call('iscsi_delete_portal_group', params) -@deprecated_alias('delete_initiator_group') def iscsi_delete_initiator_group(client, tag): """Delete an initiator group. @@ -611,7 +589,6 @@ def iscsi_portal_group_set_auth( return client.call('iscsi_portal_group_set_auth', params) -@deprecated_alias('get_iscsi_connections') def iscsi_get_connections(client): """Display iSCSI connections. @@ -621,7 +598,6 @@ def iscsi_get_connections(client): return client.call('iscsi_get_connections') -@deprecated_alias('get_iscsi_global_params') def iscsi_get_options(client): """Display iSCSI global parameters. @@ -631,7 +607,6 @@ def iscsi_get_options(client): return client.call('iscsi_get_options') -@deprecated_alias('get_iscsi_devices') def scsi_get_devices(client): """Display SCSI devices. diff --git a/scripts/rpc.py b/scripts/rpc.py index 035da08d6..619f535c4 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1207,7 +1207,7 @@ if __name__ == "__main__": immediate_data_pool_size=args.immediate_data_pool_size, data_out_pool_size=args.data_out_pool_size) - p = subparsers.add_parser('iscsi_set_options', aliases=['set_iscsi_options'], + p = subparsers.add_parser('iscsi_set_options', help="""Set options of iSCSI subsystem""") p.add_argument('-f', '--auth-file', help='Path to CHAP shared secret file') p.add_argument('-b', '--node-base', help='Prefix of the name of iSCSI target node') @@ -1244,7 +1244,7 @@ if __name__ == "__main__": mutual_chap=args.mutual_chap, chap_group=args.chap_group) - p = subparsers.add_parser('iscsi_set_discovery_auth', aliases=['set_iscsi_discovery_auth'], + p = subparsers.add_parser('iscsi_set_discovery_auth', help="""Set CHAP authentication for discovery session.""") p.add_argument('-d', '--disable-chap', help="""CHAP for discovery session should be disabled. *** Mutually exclusive with --require-chap""", action='store_true') @@ -1262,7 +1262,7 @@ if __name__ == "__main__": rpc.iscsi.iscsi_create_auth_group(args.client, tag=args.tag, secrets=secrets) - p = subparsers.add_parser('iscsi_create_auth_group', aliases=['add_iscsi_auth_group'], + p = subparsers.add_parser('iscsi_create_auth_group', help='Create authentication group for CHAP authentication.') p.add_argument('tag', help='Authentication group tag (unique, integer > 0).', type=int) p.add_argument('-c', '--secrets', help="""Comma-separated list of CHAP secrets @@ -1273,7 +1273,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def iscsi_delete_auth_group(args): rpc.iscsi.iscsi_delete_auth_group(args.client, tag=args.tag) - p = subparsers.add_parser('iscsi_delete_auth_group', aliases=['delete_iscsi_auth_group'], + p = subparsers.add_parser('iscsi_delete_auth_group', help='Delete an authentication group.') p.add_argument('tag', help='Authentication group tag', type=int) p.set_defaults(func=iscsi_delete_auth_group) @@ -1287,7 +1287,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse muser=args.muser, msecret=args.msecret) - p = subparsers.add_parser('iscsi_auth_group_add_secret', aliases=['add_secret_to_iscsi_auth_group'], + p = subparsers.add_parser('iscsi_auth_group_add_secret', help='Add a secret to an authentication group.') p.add_argument('tag', help='Authentication group tag', type=int) p.add_argument('-u', '--user', help='User name for one-way CHAP authentication', required=True) @@ -1299,7 +1299,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def iscsi_auth_group_remove_secret(args): rpc.iscsi.iscsi_auth_group_remove_secret(args.client, tag=args.tag, user=args.user) - p = subparsers.add_parser('iscsi_auth_group_remove_secret', aliases=['delete_secret_from_iscsi_auth_group'], + p = subparsers.add_parser('iscsi_auth_group_remove_secret', help='Remove a secret from an authentication group.') p.add_argument('tag', help='Authentication group tag', type=int) p.add_argument('-u', '--user', help='User name for one-way CHAP authentication', required=True) @@ -1308,31 +1308,27 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def iscsi_get_auth_groups(args): print_dict(rpc.iscsi.iscsi_get_auth_groups(args.client)) - p = subparsers.add_parser('iscsi_get_auth_groups', aliases=['get_iscsi_auth_groups'], + p = subparsers.add_parser('iscsi_get_auth_groups', help='Display current authentication group configuration') p.set_defaults(func=iscsi_get_auth_groups) def iscsi_get_portal_groups(args): print_dict(rpc.iscsi.iscsi_get_portal_groups(args.client)) - p = subparsers.add_parser( - 'iscsi_get_portal_groups', aliases=['get_portal_groups'], - help='Display current portal group configuration') + p = subparsers.add_parser('iscsi_get_portal_groups', help='Display current portal group configuration') p.set_defaults(func=iscsi_get_portal_groups) def iscsi_get_initiator_groups(args): print_dict(rpc.iscsi.iscsi_get_initiator_groups(args.client)) p = subparsers.add_parser('iscsi_get_initiator_groups', - aliases=['get_initiator_groups'], help='Display current initiator group configuration') p.set_defaults(func=iscsi_get_initiator_groups) def iscsi_get_target_nodes(args): print_dict(rpc.iscsi.iscsi_get_target_nodes(args.client)) - p = subparsers.add_parser('iscsi_get_target_nodes', aliases=['get_target_nodes'], - help='Display target nodes') + p = subparsers.add_parser('iscsi_get_target_nodes', help='Display target nodes') p.set_defaults(func=iscsi_get_target_nodes) def iscsi_create_target_node(args): @@ -1360,8 +1356,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse header_digest=args.header_digest, data_digest=args.data_digest) - p = subparsers.add_parser('iscsi_create_target_node', aliases=['construct_target_node'], - help='Add a target node') + p = subparsers.add_parser('iscsi_create_target_node', help='Add a target node') p.add_argument('name', help='Target node name (ASCII)') p.add_argument('alias_name', help='Target node alias name (ASCII)') p.add_argument('bdev_name_id_pairs', help="""Whitespace-separated list of pairs enclosed @@ -1397,7 +1392,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse bdev_name=args.bdev_name, lun_id=args.lun_id) - p = subparsers.add_parser('iscsi_target_node_add_lun', aliases=['target_node_add_lun'], + p = subparsers.add_parser('iscsi_target_node_add_lun', help='Add LUN to the target node') p.add_argument('name', help='Target node name (ASCII)') p.add_argument('bdev_name', help="""bdev name enclosed in quotes. @@ -1415,7 +1410,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse require_chap=args.require_chap, mutual_chap=args.mutual_chap) - p = subparsers.add_parser('iscsi_target_node_set_auth', aliases=['set_iscsi_target_node_auth'], + p = subparsers.add_parser('iscsi_target_node_set_auth', help='Set CHAP authentication for the target node') p.add_argument('name', help='Target node name (ASCII)') p.add_argument('-g', '--chap-group', help="""Authentication group ID for this target node. @@ -1439,7 +1434,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse name=args.name) p = subparsers.add_parser('iscsi_target_node_add_pg_ig_maps', - aliases=['add_pg_ig_maps'], help='Add PG-IG maps to the target node') p.add_argument('name', help='Target node name (ASCII)') p.add_argument('pg_ig_mappings', help="""List of (Portal_Group_Tag:Initiator_Group_Tag) mappings @@ -1458,7 +1452,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse args.client, pg_ig_maps=pg_ig_maps, name=args.name) p = subparsers.add_parser('iscsi_target_node_remove_pg_ig_maps', - aliases=['delete_pg_ig_maps'], help='Delete PG-IG maps from the target node') p.add_argument('name', help='Target node name (ASCII)') p.add_argument('pg_ig_mappings', help="""List of (Portal_Group_Tag:Initiator_Group_Tag) mappings @@ -1518,7 +1511,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse private=args.private, wait=args.wait) - p = subparsers.add_parser('iscsi_create_portal_group', aliases=['add_portal_group'], + p = subparsers.add_parser('iscsi_create_portal_group', help='Add a portal group') p.add_argument( 'tag', help='Portal group tag (unique, integer > 0)', type=int) @@ -1555,7 +1548,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse initiators=initiators, netmasks=netmasks) - p = subparsers.add_parser('iscsi_create_initiator_group', aliases=['add_initiator_group'], + p = subparsers.add_parser('iscsi_create_initiator_group', help='Add an initiator group') p.add_argument( 'tag', help='Initiator group tag (unique, integer > 0)', type=int) @@ -1583,7 +1576,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse netmasks=netmasks) p = subparsers.add_parser('iscsi_initiator_group_add_initiators', - aliases=['add_initiators_to_initiator_group'], help='Add initiators to an existing initiator group') p.add_argument( 'tag', help='Initiator group tag (unique, integer > 0)', type=int) @@ -1612,7 +1604,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse netmasks=netmasks) p = subparsers.add_parser('iscsi_initiator_group_remove_initiators', - aliases=['delete_initiators_from_initiator_group'], help='Delete initiators from an existing initiator group') p.add_argument( 'tag', help='Initiator group tag (unique, integer > 0)', type=int) @@ -1627,7 +1618,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse rpc.iscsi.iscsi_delete_target_node( args.client, target_node_name=args.target_node_name) - p = subparsers.add_parser('iscsi_delete_target_node', aliases=['delete_target_node'], + p = subparsers.add_parser('iscsi_delete_target_node', help='Delete a target node') p.add_argument('target_node_name', help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.') @@ -1637,7 +1628,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse rpc.iscsi.iscsi_delete_portal_group(args.client, tag=args.tag) p = subparsers.add_parser('iscsi_delete_portal_group', - aliases=['delete_portal_group'], help='Delete a portal group') p.add_argument( 'tag', help='Portal group tag (unique, integer > 0)', type=int) @@ -1647,7 +1637,6 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse rpc.iscsi.iscsi_delete_initiator_group(args.client, tag=args.tag) p = subparsers.add_parser('iscsi_delete_initiator_group', - aliases=['delete_initiator_group'], help='Delete an initiator group') p.add_argument( 'tag', help='Initiator group tag (unique, integer > 0)', type=int) @@ -1678,22 +1667,21 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse def iscsi_get_connections(args): print_dict(rpc.iscsi.iscsi_get_connections(args.client)) - p = subparsers.add_parser('iscsi_get_connections', aliases=['get_iscsi_connections'], + p = subparsers.add_parser('iscsi_get_connections', help='Display iSCSI connections') p.set_defaults(func=iscsi_get_connections) def iscsi_get_options(args): print_dict(rpc.iscsi.iscsi_get_options(args.client)) - p = subparsers.add_parser('iscsi_get_options', aliases=['get_iscsi_global_params'], + p = subparsers.add_parser('iscsi_get_options', help='Display iSCSI global parameters') p.set_defaults(func=iscsi_get_options) def scsi_get_devices(args): print_dict(rpc.iscsi.scsi_get_devices(args.client)) - p = subparsers.add_parser('scsi_get_devices', aliases=['get_scsi_devices'], - help='Display SCSI devices') + p = subparsers.add_parser('scsi_get_devices', help='Display SCSI devices') p.set_defaults(func=scsi_get_devices) # trace