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

rpc: Rename delete_ip_address to net_interface_delete_ip_address 



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


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 b72455c8

lib/net/interface.c

+2 −2
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ spdk_interface_net_interface_add_ip_address(int ifc_index, char *ip_addr) 
}



int

spdk_interface_delete_ip_address(int ifc_index, char *ip_addr)

spdk_interface_net_interface_delete_ip_address(int ifc_index, char *ip_addr)

{

	uint32_t addr;
@@ -491,7 +491,7 @@ spdk_interface_net_interface_add_ip_address(int ifc_index, char *ip_addr) 
}



int

spdk_interface_delete_ip_address(int ifc_index, char *ip_addr)

spdk_interface_net_interface_delete_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
@@ -67,7 +67,7 @@ int spdk_interface_net_interface_add_ip_address(int ifc_index, char *ip_addr); 
 *

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

 */

int spdk_interface_delete_ip_address(int ifc_index, char *ip_addr);

int spdk_interface_net_interface_delete_ip_address(int ifc_index, char *ip_addr);



/**

 * Get the list of all the network interfaces.

lib/net/net_rpc.c

+6 −4
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ SPDK_RPC_REGISTER("net_interface_add_ip_address", spdk_rpc_net_interface_add_ip_ 
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,

spdk_rpc_net_interface_delete_ip_address(struct spdk_jsonrpc_request *request,

		const struct spdk_json_val *params)

{

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

	}



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

	ret_val = spdk_interface_net_interface_delete_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,
@@ -139,7 +139,9 @@ spdk_rpc_delete_ip_address(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_ip_address(&req);

}

SPDK_RPC_REGISTER("delete_ip_address", spdk_rpc_delete_ip_address, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("net_interface_delete_ip_address", spdk_rpc_net_interface_delete_ip_address,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(net_interface_delete_ip_address, delete_ip_address)



static void

spdk_rpc_get_interfaces(struct spdk_jsonrpc_request *request,

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -1517,13 +1517,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('ip_addr', help='ip address will be added.')

    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)

    def net_interface_delete_ip_address(args):

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



    p = subparsers.add_parser('delete_ip_address', help='Delete IP address')

    p = subparsers.add_parser('net_interface_delete_ip_address', aliases=['delete_ip_address'],

                              help='Delete 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 deleted.')

    p.set_defaults(func=delete_ip_address)

    p.set_defaults(func=net_interface_delete_ip_address)



    def get_interfaces(args):

        print_dict(rpc.net.get_interfaces(args.client))

scripts/rpc/net.py

+3 −2
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ def net_interface_add_ip_address(client, ifc_index, ip_addr): 
    return client.call('net_interface_add_ip_address', params)





def delete_ip_address(client, ifc_index, ip_addr):

@deprecated_alias('delete_ip_address')

def net_interface_delete_ip_address(client, ifc_index, ip_addr):

    """Delete IP address.



    Args:
@@ -21,7 +22,7 @@ def delete_ip_address(client, ifc_index, ip_addr): 
        ip_addr: ip address will be deleted

    """

    params = {'ifc_index': ifc_index, 'ip_address': ip_addr}

    return client.call('delete_ip_address', params)

    return client.call('net_interface_delete_ip_address', params)





def get_interfaces(client):