Commit b72455c8 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

rpc: Rename add_ip_address to net_interface_add_ip_address 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 5e9cea26

doc/jsonrpc.md

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ Example response: 
    "get_scsi_devices",

    "get_interfaces",

    "delete_ip_address",

    "add_ip_address",

    "net_interface_add_ip_address",

    "nbd_get_disks",

    "nbd_stop_disk",

    "nbd_start_disk",

lib/net/interface.c

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ spdk_interface_destroy(void) 
}



int

spdk_interface_add_ip_address(int ifc_index, char *ip_addr)

spdk_interface_net_interface_add_ip_address(int ifc_index, char *ip_addr)

{

	uint32_t addr;
@@ -485,7 +485,7 @@ spdk_interface_destroy(void) 
}



int

spdk_interface_add_ip_address(int ifc_index, char *ip_addr)

spdk_interface_net_interface_add_ip_address(int ifc_index, char *ip_addr)

{

	return -1;

}

lib/net/net_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct spdk_interface { 
 *

 * \return 0 on success, -1 on failure.

 */

int spdk_interface_add_ip_address(int ifc_index, char *ip_addr);

int spdk_interface_net_interface_add_ip_address(int ifc_index, char *ip_addr);



/**

 * Delete an ip address from the network interface.

lib/net/net_rpc.c

+6 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static const struct spdk_json_object_decoder rpc_ip_address_decoders[] = { 
};



static void

spdk_rpc_add_ip_address(struct spdk_jsonrpc_request *request,

spdk_rpc_net_interface_add_ip_address(struct spdk_jsonrpc_request *request,

				      const struct spdk_json_val *params)

{

	struct rpc_ip_address req = {};
@@ -74,7 +74,7 @@ spdk_rpc_add_ip_address(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	ret_val = spdk_interface_add_ip_address(req.ifc_index, req.ip_address);

	ret_val = spdk_interface_net_interface_add_ip_address(req.ifc_index, req.ip_address);

	if (ret_val) {

		if (ret_val == -ENODEV) {

			spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_STATE,
@@ -96,7 +96,9 @@ spdk_rpc_add_ip_address(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_ip_address(&req);

}

SPDK_RPC_REGISTER("add_ip_address", spdk_rpc_add_ip_address, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("net_interface_add_ip_address", spdk_rpc_net_interface_add_ip_address,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(net_interface_add_ip_address, add_ip_address)



static void

spdk_rpc_delete_ip_address(struct spdk_jsonrpc_request *request,

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -1508,13 +1508,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.set_defaults(func=nbd_get_disks)



    # net

    def add_ip_address(args):

        rpc.net.add_ip_address(args.client, ifc_index=args.ifc_index, ip_addr=args.ip_addr)

    def net_interface_add_ip_address(args):

        rpc.net.net_interface_add_ip_address(args.client, ifc_index=args.ifc_index, ip_addr=args.ip_addr)



    p = subparsers.add_parser('add_ip_address', help='Add IP address')

    p = subparsers.add_parser('net_interface_add_ip_address', aliases=['add_ip_address'],

                              help='Add IP address')

    p.add_argument('ifc_index', help='ifc index of the nic device.', type=int)

    p.add_argument('ip_addr', help='ip address will be added.')

    p.set_defaults(func=add_ip_address)

    p.set_defaults(func=net_interface_add_ip_address)



    def delete_ip_address(args):

        rpc.net.delete_ip_address(args.client, ifc_index=args.ifc_index, ip_addr=args.ip_addr)