Commit bcab0b3b authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

rpc: Rename delete_iscsi_auth_group to iscsi_delete_auth_group 



Change-Id: I480c9bbe521eb9998ba827ea1a9989b61a501dd3
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468358


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent d9edd3af

doc/jsonrpc.md

+2 −2
Original line number Diff line number Diff line
@@ -2749,7 +2749,7 @@ Example response: 
}

~~~



## delete_iscsi_auth_group method {#rpc_delete_iscsi_auth_group}

## iscsi_delete_auth_group method {#rpc_iscsi_delete_auth_group}



Delete an existing authentication group for CHAP authentication.
@@ -2769,7 +2769,7 @@ Example request: 
    "tag": 2

  },

  "jsonrpc": "2.0",

  "method": "delete_iscsi_auth_group",

  "method": "iscsi_delete_auth_group",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+3 −2
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ static const struct spdk_json_object_decoder rpc_delete_auth_group_decoders[] = 
};



static void

spdk_rpc_delete_iscsi_auth_group(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_delete_auth_group(struct spdk_jsonrpc_request *request,

				 const struct spdk_json_val *params)

{

	struct rpc_delete_auth_group req = {};
@@ -1329,7 +1329,8 @@ spdk_rpc_delete_iscsi_auth_group(struct spdk_jsonrpc_request *request, 
	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("delete_iscsi_auth_group", spdk_rpc_delete_iscsi_auth_group, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_delete_auth_group", spdk_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;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -764,12 +764,13 @@ if __name__ == "__main__": 
Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 msecret:ms2'""", required=False)

    p.set_defaults(func=iscsi_create_auth_group)



    def delete_iscsi_auth_group(args):

        rpc.iscsi.delete_iscsi_auth_group(args.client, tag=args.tag)

    def iscsi_delete_auth_group(args):

        rpc.iscsi.iscsi_delete_auth_group(args.client, tag=args.tag)



    p = subparsers.add_parser('delete_iscsi_auth_group', help='Delete an authentication group.')

    p = subparsers.add_parser('iscsi_delete_auth_group', aliases=['delete_iscsi_auth_group'],

                              help='Delete an authentication group.')

    p.add_argument('tag', help='Authentication group tag', type=int)

    p.set_defaults(func=delete_iscsi_auth_group)

    p.set_defaults(func=iscsi_delete_auth_group)



    def iscsi_auth_group_add_secret(args):

        rpc.iscsi.iscsi_auth_group_add_secret(

scripts/rpc/iscsi.py

+3 −2
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ def iscsi_create_auth_group(client, tag, secrets=None): 
    return client.call('iscsi_create_auth_group', params)





def delete_iscsi_auth_group(client, tag):

@deprecated_alias('delete_iscsi_auth_group')

def iscsi_delete_auth_group(client, tag):

    """Delete an authentication group.



    Args:
@@ -295,7 +296,7 @@ def delete_iscsi_auth_group(client, tag): 
        True or False

    """

    params = {'tag': tag}

    return client.call('delete_iscsi_auth_group', params)

    return client.call('iscsi_delete_auth_group', params)





@deprecated_alias('add_secret_to_iscsi_auth_group')

scripts/spdkcli/ui_node_iscsi.py

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ class UIISCSIAuthGroups(UINode): 
            UIISCSIAuthGroup(ag, self)



    def delete(self, tag):

        self.get_root().delete_iscsi_auth_group(tag=tag)

        self.get_root().iscsi_delete_auth_group(tag=tag)



    def delete_secret(self, tag, user):

        self.get_root().delete_secret_from_iscsi_auth_group(