From 06a1b4199caadda20866a89170a203b400c47808 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Mon, 19 Aug 2019 04:19:29 -0400 Subject: [PATCH] scripts/rpc: Rename rpc delete_malloc_bdev to bdev_malloc_delete Change-Id: I9841d79bfe1090bb25893610659300531b6b43a4 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465637 Community-CI: Broadcom SPDK FC-NVMe CI Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- doc/jsonrpc.md | 6 +- doc/vhost.md | 2 +- module/bdev/malloc/bdev_malloc_rpc.c | 9 +- scripts/rpc.py | 9 +- scripts/rpc/bdev.py | 5 +- scripts/spdkcli/ui_node.py | 2 +- scripts/spdkcli/ui_root.py | 4 +- test/iscsi_tgt/fio/fio.sh | 4 +- test/iscsi_tgt/trace_record/trace_record.sh | 2 +- test/json_config/clear_config.py | 2 +- test/json_config/json_config.sh | 2 +- test/lvol/rpc_commands_lib.py | 6 +- test/lvol/test_cases.py | 104 ++++++++++---------- test/nvmf/host/aer.sh | 4 +- test/nvmf/target/fio.sh | 2 +- test/ocf/management/create-destruct.sh | 2 +- test/ocf/management/multicore.sh | 2 +- test/vhost/migration/migration-tc1.sh | 2 +- 18 files changed, 86 insertions(+), 83 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index ec0da2ab1..d855c14c0 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -295,7 +295,7 @@ Example response: "delete_nvme_controller", "construct_nvme_bdev", "bdev_null_create", - "delete_malloc_bdev", + "bdev_malloc_delete", "bdev_malloc_create", "delete_ftl_bdev", "construct_ftl_bdev", @@ -1196,7 +1196,7 @@ Example response: } ~~~ -## delete_malloc_bdev {#rpc_delete_malloc_bdev} +## bdev_malloc_delete {#rpc_bdev_malloc_delete} Delete @ref bdev_config_malloc @@ -1216,7 +1216,7 @@ Example request: "name": "Malloc0" }, "jsonrpc": "2.0", - "method": "delete_malloc_bdev", + "method": "bdev_malloc_delete", "id": 1 } ~~~ diff --git a/doc/vhost.md b/doc/vhost.md index fc8d3805e..3f96ce9ef 100644 --- a/doc/vhost.md +++ b/doc/vhost.md @@ -393,7 +393,7 @@ scripts/rpc.py remove_vhost_scsi_target vhost.0 0 Removing an entire bdev will hot-detach it from a controller as well. ~~~{.sh} -scripts/rpc.py delete_malloc_bdev Malloc0 +scripts/rpc.py bdev_malloc_delete Malloc0 ~~~ # Known bugs and limitations {#vhost_bugs} diff --git a/module/bdev/malloc/bdev_malloc_rpc.c b/module/bdev/malloc/bdev_malloc_rpc.c index 5640d08a3..7ad21995f 100644 --- a/module/bdev/malloc/bdev_malloc_rpc.c +++ b/module/bdev/malloc/bdev_malloc_rpc.c @@ -128,7 +128,7 @@ static const struct spdk_json_object_decoder rpc_delete_malloc_decoders[] = { }; static void -_spdk_rpc_delete_malloc_bdev_cb(void *cb_arg, int bdeverrno) +_spdk_rpc_bdev_malloc_delete_cb(void *cb_arg, int bdeverrno) { struct spdk_jsonrpc_request *request = cb_arg; struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request); @@ -138,7 +138,7 @@ _spdk_rpc_delete_malloc_bdev_cb(void *cb_arg, int bdeverrno) } static void -spdk_rpc_delete_malloc_bdev(struct spdk_jsonrpc_request *request, +spdk_rpc_bdev_malloc_delete(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct rpc_delete_malloc req = {NULL}; @@ -160,7 +160,7 @@ spdk_rpc_delete_malloc_bdev(struct spdk_jsonrpc_request *request, goto cleanup; } - delete_malloc_disk(bdev, _spdk_rpc_delete_malloc_bdev_cb, request); + delete_malloc_disk(bdev, _spdk_rpc_bdev_malloc_delete_cb, request); free_rpc_delete_malloc(&req); @@ -169,4 +169,5 @@ spdk_rpc_delete_malloc_bdev(struct spdk_jsonrpc_request *request, cleanup: free_rpc_delete_malloc(&req); } -SPDK_RPC_REGISTER("delete_malloc_bdev", spdk_rpc_delete_malloc_bdev, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_malloc_delete", spdk_rpc_bdev_malloc_delete, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_malloc_delete, delete_malloc_bdev) diff --git a/scripts/rpc.py b/scripts/rpc.py index adfa2807d..c3f94bf8e 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -253,13 +253,14 @@ if __name__ == "__main__": p.add_argument('block_size', help='Block size for this bdev', type=int) p.set_defaults(func=bdev_malloc_create) - def delete_malloc_bdev(args): - rpc.bdev.delete_malloc_bdev(args.client, + def bdev_malloc_delete(args): + rpc.bdev.bdev_malloc_delete(args.client, name=args.name) - p = subparsers.add_parser('delete_malloc_bdev', help='Delete a malloc disk') + p = subparsers.add_parser('bdev_malloc_delete', aliases=['delete_malloc_bdev'], + help='Delete a malloc disk') p.add_argument('name', help='malloc bdev name') - p.set_defaults(func=delete_malloc_bdev) + p.set_defaults(func=bdev_malloc_delete) def bdev_null_create(args): num_blocks = (args.total_size * 1024 * 1024) // args.block_size diff --git a/scripts/rpc/bdev.py b/scripts/rpc/bdev.py index 814f31bff..2b39a2cb8 100644 --- a/scripts/rpc/bdev.py +++ b/scripts/rpc/bdev.py @@ -183,14 +183,15 @@ def bdev_malloc_create(client, num_blocks, block_size, name=None, uuid=None): return client.call('bdev_malloc_create', params) -def delete_malloc_bdev(client, name): +@deprecated_alias('delete_malloc_bdev') +def bdev_malloc_delete(client, name): """Delete malloc block device. Args: bdev_name: name of malloc bdev to delete """ params = {'name': name} - return client.call('delete_malloc_bdev', params) + return client.call('bdev_malloc_delete', params) @deprecated_alias('construct_null_bdev') diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py index f8936586c..282183411 100644 --- a/scripts/spdkcli/ui_node.py +++ b/scripts/spdkcli/ui_node.py @@ -166,7 +166,7 @@ class UIMallocBdev(UIBdev): UIBdev.__init__(self, "malloc", parent) def delete(self, name): - self.get_root().delete_malloc_bdev(name=name) + self.get_root().bdev_malloc_delete(name=name) def ui_command_create(self, size, block_size, name=None, uuid=None): """ diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index 3abd84c6c..4c12b675a 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -131,8 +131,8 @@ class UIRoot(UINode): return response @verbose - def delete_malloc_bdev(self, **kwargs): - rpc.bdev.delete_malloc_bdev(self.client, **kwargs) + def bdev_malloc_delete(self, **kwargs): + rpc.bdev.bdev_malloc_delete(self.client, **kwargs) @verbose def create_iscsi_bdev(self, **kwargs): diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh index 601e7eddc..063287dd4 100755 --- a/test/iscsi_tgt/fio/fio.sh +++ b/test/iscsi_tgt/fio/fio.sh @@ -124,11 +124,11 @@ $rpc_py destroy_raid_bdev 'raid0' # Delete all allocated malloc blockdevs for malloc_bdev in $malloc_bdevs; do - $rpc_py delete_malloc_bdev $malloc_bdev + $rpc_py bdev_malloc_delete $malloc_bdev done # Delete malloc device -$rpc_py delete_malloc_bdev ${bdev} +$rpc_py bdev_malloc_delete ${bdev} fio_status=0 wait $fio_pid || fio_status=$? diff --git a/test/iscsi_tgt/trace_record/trace_record.sh b/test/iscsi_tgt/trace_record/trace_record.sh index a3ca25738..37f71f2d6 100755 --- a/test/iscsi_tgt/trace_record/trace_record.sh +++ b/test/iscsi_tgt/trace_record/trace_record.sh @@ -86,7 +86,7 @@ RPCS= # Delete Malloc blockdevs and targets for i in $(seq 0 $CONNECTION_NUMBER); do RPCS+="delete_target_node iqn.2016-06.io.spdk:Target$i\n" - RPCS+="delete_malloc_bdev Malloc$i\n" + RPCS+="bdev_malloc_delete Malloc$i\n" done echo -e $RPCS | $rpc_py diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py index 8429709e1..0790f7168 100755 --- a/test/json_config/clear_config.py +++ b/test/json_config/clear_config.py @@ -31,7 +31,7 @@ def get_bdev_name(bdev): def get_bdev_destroy_method(bdev): - destroy_method_map = {'bdev_malloc_create': "delete_malloc_bdev", + destroy_method_map = {'bdev_malloc_create': "bdev_malloc_delete", 'bdev_null_create': "bdev_null_delete", 'construct_rbd_bdev': "delete_rbd_bdev", 'bdev_pmem_create': "bdev_pmem_delete", diff --git a/test/json_config/json_config.sh b/test/json_config/json_config.sh index 7b6fdbedd..6119fa92f 100755 --- a/test/json_config/json_config.sh +++ b/test/json_config/json_config.sh @@ -476,7 +476,7 @@ fi echo "INFO: changing configuration and checking if this can be detected..." # Self test to check if configuration diff can be detected. -tgt_rpc delete_malloc_bdev MallocBdevForConfigChangeCheck +tgt_rpc bdev_malloc_delete MallocBdevForConfigChangeCheck if $rootdir/test/json_config/json_diff.sh <(tgt_rpc save_config) "${configs_path[target]}" >/dev/null; then echo "ERROR: intentional configuration difference not detected!" false diff --git a/test/lvol/rpc_commands_lib.py b/test/lvol/rpc_commands_lib.py index 009388ba5..fbbd96c45 100644 --- a/test/lvol/rpc_commands_lib.py +++ b/test/lvol/rpc_commands_lib.py @@ -149,9 +149,9 @@ class Commands_Rpc(object): output, rc = self.rpc.bdev_lvol_delete_lvstore(name_opt, uuid) return rc - def delete_malloc_bdev(self, base_name): - print("INFO: RPC COMMAND delete_malloc_bdev") - output, rc = self.rpc.delete_malloc_bdev(base_name) + def bdev_malloc_delete(self, base_name): + print("INFO: RPC COMMAND bdev_malloc_delete") + output, rc = self.rpc.bdev_malloc_delete(base_name) return rc def bdev_lvol_delete(self, bdev_name): diff --git a/test/lvol/test_cases.py b/test/lvol/test_cases.py index 8499f8119..1af76d8ef 100644 --- a/test/lvol/test_cases.py +++ b/test/lvol/test_cases.py @@ -333,7 +333,7 @@ class TestCases(object): fail_count = self.c.check_bdev_lvol_get_lvstores(base_name, uuid_store, self.cluster_size) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: fail_count += 1 @@ -372,7 +372,7 @@ class TestCases(object): lvs_size) self.c.bdev_lvol_delete(uuid_bdev) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - call successful, return code = 0 @@ -418,7 +418,7 @@ class TestCases(object): self.c.bdev_lvol_delete(uuid_bdev) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -455,7 +455,7 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete(uuid_bdev) fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -505,8 +505,8 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete(uuid_bdev_2) fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store_1) fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store_2) - fail_count += self.c.delete_malloc_bdev(base_name_1) - fail_count += self.c.delete_malloc_bdev(base_name_2) + fail_count += self.c.bdev_malloc_delete(base_name_1) + fail_count += self.c.bdev_malloc_delete(base_name_2) # Expected result: # - calls successful, return code = 0 @@ -569,7 +569,7 @@ class TestCases(object): self.c.bdev_lvol_delete(uuid_bdev) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - first call successful @@ -612,7 +612,7 @@ class TestCases(object): self.c.bdev_lvol_delete(uuid_bdev) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected results: # - creating two logical volumes with the same friendly name within the same @@ -668,7 +668,7 @@ class TestCases(object): self.c.bdev_lvol_delete(uuid_bdev) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - lvol bdev should change size after resize operations # - calls successful, return code = 0 @@ -726,7 +726,7 @@ class TestCases(object): self.c.bdev_lvol_delete(uuid_bdev) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - bdev_lvol_resize call return code != 0 @@ -757,7 +757,7 @@ class TestCases(object): # Check correct response bdev_lvol_get_lvstores command if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: fail_count += 1 - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -788,7 +788,7 @@ class TestCases(object): # Check correct response bdev_lvol_get_lvstores command if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: fail_count += 1 - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -829,7 +829,7 @@ class TestCases(object): # Check correct response bdev_lvol_get_lvstores command if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: fail_count += 1 - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -870,7 +870,7 @@ class TestCases(object): # Check correct response bdev_lvol_get_lvstores command if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: fail_count += 1 - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - call successful, return code = 0 @@ -938,7 +938,7 @@ class TestCases(object): self.c.bdev_lvol_delete_lvstore(uuid_store) if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: fail_count += 1 - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - lvol bdev should change size after resize operations @@ -1025,7 +1025,7 @@ class TestCases(object): self.cluster_size) # Delete malloc bdev - if self.c.delete_malloc_bdev(base_name) != 0: + if self.c.bdev_malloc_delete(base_name) != 0: fail_count += 1 # Try to destroy lvol store. This call should fail as lvol store @@ -1081,7 +1081,7 @@ class TestCases(object): self.lvs_name) == 0: fail_count += 1 self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) return fail_count @case_message @@ -1115,8 +1115,8 @@ class TestCases(object): fail_count += 1 fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store_1) - fail_count += self.c.delete_malloc_bdev(base_name_1) - fail_count += self.c.delete_malloc_bdev(base_name_2) + fail_count += self.c.bdev_malloc_delete(base_name_1) + fail_count += self.c.bdev_malloc_delete(base_name_2) return fail_count @@ -1162,7 +1162,7 @@ class TestCases(object): if self.c.bdev_lvol_create(nested_lvs_uuid, nested_lbd_name, nested_size) == 0: fail_count += 1 - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - second bdev_lvol_create call on nested lvol store return code != 0 @@ -1188,7 +1188,7 @@ class TestCases(object): fail_count = self.c.check_bdev_lvol_get_lvstores(base_name, uuid_store, self.cluster_size) # Delete malloc bdev - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Check response bdev_lvol_get_lvstores command if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: fail_count += 1 @@ -1256,7 +1256,7 @@ class TestCases(object): fail_count += 1 # Delete malloc bdev - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - bdev_lvol_get_lvstores: response should be of no value after destroyed lvol store # - no other operation fails @@ -1316,7 +1316,7 @@ class TestCases(object): fail_count += 1 # Delete malloc bdev - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - bdev_lvol_get_lvstores: response should be of no value after destroyed lvol store # - no other operation fails @@ -1364,7 +1364,7 @@ class TestCases(object): snapshot_bdev2 = self.c.get_lvol_bdev_with_name(self.lvs_name + "/" + snapshot_name2) # Delete malloc bdev - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Check response bdev_lvol_get_lvstores command if self.c.check_bdev_lvol_get_lvstores("", "", "") == 1: @@ -1394,7 +1394,7 @@ class TestCases(object): (self.total_size * 1024 * 1024) + 1) == 0 if self.c.check_bdev_lvol_get_lvstores(base_name, lvol_uuid) == 0: fail_count += 1 - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - return code != 0 @@ -1418,7 +1418,7 @@ class TestCases(object): # Verify that lvol store was not created if self.c.check_bdev_lvol_get_lvstores(base_name, lvol_uuid) == 0: fail_count += 1 - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - construct lvol store return code != 0 @@ -1439,7 +1439,7 @@ class TestCases(object): # Construct lvol store with clear method 'none' lvol_uuid = self.c.bdev_lvol_create_lvstore(base_name, self.lvs_name, clear_method="none") fail_count += self.c.check_bdev_lvol_get_lvstores(base_name, lvol_uuid) - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Create malloc bdev base_name = self.c.bdev_malloc_create(self.total_size, @@ -1447,7 +1447,7 @@ class TestCases(object): # Construct lvol store with clear method 'unmap' lvol_uuid = self.c.bdev_lvol_create_lvstore(base_name, self.lvs_name, clear_method="unmap") fail_count += self.c.check_bdev_lvol_get_lvstores(base_name, lvol_uuid) - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Create malloc bdev base_name = self.c.bdev_malloc_create(self.total_size, @@ -1455,7 +1455,7 @@ class TestCases(object): # Construct lvol store with clear method 'write_zeroes' lvol_uuid = self.c.bdev_lvol_create_lvstore(base_name, self.lvs_name, clear_method="write_zeroes") fail_count += self.c.check_bdev_lvol_get_lvstores(base_name, lvol_uuid) - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - construct lvol store return code != 0 @@ -1536,7 +1536,7 @@ class TestCases(object): # destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # destroy malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 # - no other operation fails @@ -1594,7 +1594,7 @@ class TestCases(object): # destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # destroy malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 # - no other operation fails @@ -1636,7 +1636,7 @@ class TestCases(object): # destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # destroy malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 # - verification ends with success @@ -1708,7 +1708,7 @@ class TestCases(object): self.c.bdev_lvol_delete(uuid_bdev) self.c.bdev_lvol_delete_lvstore(uuid_store) - self.c.delete_malloc_bdev(base_name) + self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -1781,7 +1781,7 @@ class TestCases(object): # destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # destroy malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 # - no other operation fails @@ -1839,7 +1839,7 @@ class TestCases(object): # destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # destroy malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 # - no other operation fails @@ -2165,7 +2165,7 @@ class TestCases(object): # Destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2240,7 +2240,7 @@ class TestCases(object): # Destroy snapshot fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2298,7 +2298,7 @@ class TestCases(object): # Destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc bdevs - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2343,7 +2343,7 @@ class TestCases(object): # Destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2405,7 +2405,7 @@ class TestCases(object): # Delete lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Destroy malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2477,7 +2477,7 @@ class TestCases(object): # Destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2568,7 +2568,7 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2658,7 +2658,7 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2728,7 +2728,7 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2831,7 +2831,7 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2895,7 +2895,7 @@ class TestCases(object): # Destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -2973,7 +2973,7 @@ class TestCases(object): # Destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -3094,7 +3094,7 @@ class TestCases(object): # Destroy lvol store fail_count += self.c.bdev_lvol_delete_lvstore(uuid_store) # Delete malloc bdev - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected result: # - calls successful, return code = 0 @@ -3177,7 +3177,7 @@ class TestCases(object): for bdev in new_bdev_aliases: fail_count += self.c.bdev_lvol_delete(bdev) fail_count += self.c.bdev_lvol_delete_lvstore(new_lvs_name) - fail_count += self.c.delete_malloc_bdev(base_name) + fail_count += self.c.bdev_malloc_delete(base_name) # Expected results: # - lvol store and lvol bdevs correctly created @@ -3296,8 +3296,8 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete(lvol_uuid) fail_count += self.c.bdev_lvol_delete_lvstore(lvs_uuid_1) fail_count += self.c.bdev_lvol_delete_lvstore(lvs_uuid_2) - fail_count += self.c.delete_malloc_bdev(base_bdev_1) - fail_count += self.c.delete_malloc_bdev(base_bdev_2) + fail_count += self.c.bdev_malloc_delete(base_bdev_1) + fail_count += self.c.bdev_malloc_delete(base_bdev_2) # Expected results: # - bdev_lvol_rename_lvstore return code != 0; not possible to rename to already @@ -3370,7 +3370,7 @@ class TestCases(object): fail_count += self.c.bdev_lvol_delete(bdev_uuid_1) fail_count += self.c.bdev_lvol_delete(bdev_uuid_2) fail_count += self.c.bdev_lvol_delete_lvstore(lvs_uuid) - fail_count += self.c.delete_malloc_bdev(base_bdev) + fail_count += self.c.bdev_malloc_delete(base_bdev) # Expected results: # - bdev_lvol_rename return code != 0; not possible to rename to already diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh index c73be67ca..7e8670b0b 100755 --- a/test/nvmf/host/aer.sh +++ b/test/nvmf/host/aer.sh @@ -42,8 +42,8 @@ $rpc_py get_nvmf_subsystems wait $aerpid -$rpc_py delete_malloc_bdev Malloc0 -$rpc_py delete_malloc_bdev Malloc1 +$rpc_py bdev_malloc_delete Malloc0 +$rpc_py bdev_malloc_delete Malloc1 $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT diff --git a/test/nvmf/target/fio.sh b/test/nvmf/target/fio.sh index 186e90b42..aa936937b 100755 --- a/test/nvmf/target/fio.sh +++ b/test/nvmf/target/fio.sh @@ -53,7 +53,7 @@ sleep 3 $rpc_py destroy_raid_bdev "raid0" for malloc_bdev in $malloc_bdevs; do - $rpc_py delete_malloc_bdev "$malloc_bdev" + $rpc_py bdev_malloc_delete "$malloc_bdev" done fio_status=0 diff --git a/test/ocf/management/create-destruct.sh b/test/ocf/management/create-destruct.sh index a60ebac5f..be6faeede 100755 --- a/test/ocf/management/create-destruct.sh +++ b/test/ocf/management/create-destruct.sh @@ -67,7 +67,7 @@ if ! (bdev_check_claimed Malloc0 && bdev_check_claimed Malloc1); then exit 1 fi -$rpc_py delete_malloc_bdev Malloc0 +$rpc_py bdev_malloc_delete Malloc0 if bdev_check_claimed Malloc1; then >&2 echo "Base device is not expected to be claimed now" diff --git a/test/ocf/management/multicore.sh b/test/ocf/management/multicore.sh index 4d2ccdffe..04942a01e 100755 --- a/test/ocf/management/multicore.sh +++ b/test/ocf/management/multicore.sh @@ -67,7 +67,7 @@ $rpc_py bdev_ocf_create C2 wt Cache Core $rpc_py bdev_ocf_get_bdevs Cache | jq \ 'length == 2' -$rpc_py delete_malloc_bdev Cache +$rpc_py bdev_malloc_delete Cache $rpc_py bdev_ocf_get_bdevs | jq -e \ '. == []' diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh index d3f2abb58..7c034a51a 100644 --- a/test/vhost/migration/migration-tc1.sh +++ b/test/vhost/migration/migration-tc1.sh @@ -5,7 +5,7 @@ function migration_tc1_clean_vhost_config() notice "Removing vhost devices & controllers via RPC ..." # Delete bdev first to remove all LUNs and SCSI targets - $rpc delete_malloc_bdev Malloc0 + $rpc bdev_malloc_delete Malloc0 # Delete controllers $rpc remove_vhost_controller $incoming_vm_ctrlr