diff --git a/lib/net/interface.c b/lib/net/interface.c index 61e64c2fd..5bbdb0777 100644 --- a/lib/net/interface.c +++ b/lib/net/interface.c @@ -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; } diff --git a/lib/net/net_internal.h b/lib/net/net_internal.h index abe045e61..b6121a2df 100644 --- a/lib/net/net_internal.h +++ b/lib/net/net_internal.h @@ -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. diff --git a/lib/net/net_rpc.c b/lib/net/net_rpc.c index a39d607b6..d0ae2b581 100644 --- a/lib/net/net_rpc.c +++ b/lib/net/net_rpc.c @@ -101,8 +101,8 @@ 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, - const struct spdk_json_val *params) +spdk_rpc_net_interface_delete_ip_address(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_ip_address req = {}; struct spdk_json_write_ctx *w; @@ -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, diff --git a/scripts/rpc.py b/scripts/rpc.py index 8cca914aa..1dfd30764 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -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)) diff --git a/scripts/rpc/net.py b/scripts/rpc/net.py index 1baa6fe95..58117ca93 100644 --- a/scripts/rpc/net.py +++ b/scripts/rpc/net.py @@ -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): diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py index 398e95588..5f64237d0 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.py +++ b/test/iscsi_tgt/rpc_config/rpc_config.py @@ -236,7 +236,7 @@ def verify_portal_groups_rpc_methods(rpc_py, rpc_param): for x in nics: if x["ifc_index"] == 'lo': - rpc.delete_ip_address(x["ifc_index"], lo_ip[1]) + rpc.net_interface_delete_ip_address(x["ifc_index"], lo_ip[1]) print("verify_portal_groups_rpc_methods passed") @@ -421,7 +421,7 @@ def help_get_interface_ip_list(rpc_py, nic_name): return nic[0]["ip_addr"] -def verify_add_delete_ip_address(rpc_py): +def verify_net_interface_add_delete_ip_address(rpc_py): rpc = spdk_rpc(rpc_py) nics = json.loads(rpc.get_interfaces()) # add ip on up to first 2 nics @@ -437,7 +437,7 @@ def verify_add_delete_ip_address(rpc_py): verify(False, 1, "ping ip {} for {} was failed(adding was successful)".format (faked_ip, x["name"])) - rpc.delete_ip_address(x["ifc_index"], faked_ip) + rpc.net_interface_delete_ip_address(x["ifc_index"], faked_ip) verify(faked_ip not in help_get_interface_ip_list(rpc_py, x["name"]), 1, "delete ip {} from nic {} failed.(adding and ping were successful)".format (faked_ip, x["name"])) @@ -454,7 +454,7 @@ def verify_add_delete_ip_address(rpc_py): verify(False, 1, "ip {} for {} could be pinged after delete ip(adding/ping/delete were successful)".format (faked_ip, x["name"])) - print("verify_add_delete_ip_address passed.") + print("verify_net_interface_add_delete_ip_address passed.") def verify_add_nvme_bdev_rpc_methods(rpc_py): @@ -489,7 +489,7 @@ if __name__ == "__main__": # Add/delete IP will not be supported in VPP. # It has separate vppctl utility for that. if test_type == 'posix': - verify_add_delete_ip_address(rpc_py) + verify_net_interface_add_delete_ip_address(rpc_py) create_malloc_bdevs_rpc_methods(rpc_py, rpc_param) verify_portal_groups_rpc_methods(rpc_py, rpc_param) verify_initiator_groups_rpc_methods(rpc_py, rpc_param)