diff --git a/doc/bdev.md b/doc/bdev.md index 35224c770..c855a257a 100644 --- a/doc/bdev.md +++ b/doc/bdev.md @@ -515,11 +515,11 @@ Example command `rpc.py bdev_pmem_create_pool /path/to/pmem_pool 25 4096` -To get information on created pmem pool file user can use `pmem_pool_info` RPC command. +To get information on created pmem pool file user can use `bdev_pmem_get_pool_info` RPC command. Example command -`rpc.py pmem_pool_info /path/to/pmem_pool` +`rpc.py bdev_pmem_get_pool_info /path/to/pmem_pool` To remove pmem pool file user can use `delete_pmem_pool` RPC command. diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index c5b1b4e3b..233de427d 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -2141,7 +2141,7 @@ Example response: } ~~~ -## pmem_pool_info {#rpc_pmem_pool_info} +## bdev_pmem_get_pool_info {#rpc_bdev_pmem_get_pool_info} Retrieve basic information about PMDK memory pool. @@ -2173,7 +2173,7 @@ request: "pmem_file": "/tmp/pmem_file" }, "jsonrpc": "2.0", - "method": "pmem_pool_info", + "method": "bdev_pmem_get_pool_info", "id": 1 } ~~~ diff --git a/module/bdev/pmem/bdev_pmem_rpc.c b/module/bdev/pmem/bdev_pmem_rpc.c index 23e671bc6..8e83fc19f 100644 --- a/module/bdev/pmem/bdev_pmem_rpc.c +++ b/module/bdev/pmem/bdev_pmem_rpc.c @@ -215,31 +215,31 @@ cleanup: SPDK_RPC_REGISTER("bdev_pmem_create_pool", spdk_rpc_bdev_pmem_create_pool, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_create_pool, create_pmem_pool) -struct rpc_pmem_pool_info { +struct rpc_bdev_pmem_get_pool_info { char *pmem_file; }; -static const struct spdk_json_object_decoder rpc_pmem_pool_info_decoders[] = { - {"pmem_file", offsetof(struct rpc_pmem_pool_info, pmem_file), spdk_json_decode_string}, +static const struct spdk_json_object_decoder rpc_bdev_pmem_get_pool_info_decoders[] = { + {"pmem_file", offsetof(struct rpc_bdev_pmem_get_pool_info, pmem_file), spdk_json_decode_string}, }; static void -free_rpc_pmem_pool_info(struct rpc_pmem_pool_info *req) +free_rpc_bdev_pmem_get_pool_info(struct rpc_bdev_pmem_get_pool_info *req) { free(req->pmem_file); } static void -spdk_rpc_pmem_pool_info(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +spdk_rpc_bdev_pmem_get_pool_info(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { - struct rpc_pmem_pool_info req = {}; + struct rpc_bdev_pmem_get_pool_info req = {}; struct spdk_json_write_ctx *w; size_t num_blocks, block_size; PMEMblkpool *pbp; - if (spdk_json_decode_object(params, rpc_pmem_pool_info_decoders, - SPDK_COUNTOF(rpc_pmem_pool_info_decoders), + if (spdk_json_decode_object(params, rpc_bdev_pmem_get_pool_info_decoders, + SPDK_COUNTOF(rpc_bdev_pmem_get_pool_info_decoders), &req)) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, "spdk_json_decode_object failed"); @@ -279,9 +279,10 @@ spdk_rpc_pmem_pool_info(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); cleanup: - free_rpc_pmem_pool_info(&req); + free_rpc_bdev_pmem_get_pool_info(&req); } -SPDK_RPC_REGISTER("pmem_pool_info", spdk_rpc_pmem_pool_info, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("bdev_pmem_get_pool_info", spdk_rpc_bdev_pmem_get_pool_info, SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_get_pool_info, pmem_pool_info) struct rpc_delete_pmem_pool { char *pmem_file; diff --git a/scripts/rpc.py b/scripts/rpc.py index de8444b1f..5ae849a3b 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1722,13 +1722,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p.add_argument('block_size', help='Block size for this pmem pool', type=int) p.set_defaults(func=bdev_pmem_create_pool) - def pmem_pool_info(args): - print_dict(rpc.pmem.pmem_pool_info(args.client, - pmem_file=args.pmem_file)) + def bdev_pmem_get_pool_info(args): + print_dict(rpc.pmem.bdev_pmem_get_pool_info(args.client, + pmem_file=args.pmem_file)) - p = subparsers.add_parser('pmem_pool_info', help='Display pmem pool info and check consistency') + p = subparsers.add_parser('bdev_pmem_get_pool_info', aliases=['pmem_pool_info'], + help='Display pmem pool info and check consistency') p.add_argument('pmem_file', help='Path to pmemblk pool file') - p.set_defaults(func=pmem_pool_info) + p.set_defaults(func=bdev_pmem_get_pool_info) def delete_pmem_pool(args): rpc.pmem.delete_pmem_pool(args.client, diff --git a/scripts/rpc/pmem.py b/scripts/rpc/pmem.py index 059d3e411..5b225b317 100644 --- a/scripts/rpc/pmem.py +++ b/scripts/rpc/pmem.py @@ -15,13 +15,14 @@ def bdev_pmem_create_pool(client, pmem_file, num_blocks, block_size): return client.call('bdev_pmem_create_pool', params) -def pmem_pool_info(client, pmem_file): +@deprecated_alias('pmem_pool_info') +def bdev_pmem_get_pool_info(client, pmem_file): """Get details about pmem pool. Args: pmem_file: path to pmem pool """ params = {'pmem_file': pmem_file} - return client.call('pmem_pool_info', params) + return client.call('bdev_pmem_get_pool_info', params) def delete_pmem_pool(client, pmem_file): diff --git a/scripts/spdkcli/ui_node.py b/scripts/spdkcli/ui_node.py index cadfab8b3..2a9eec4e9 100644 --- a/scripts/spdkcli/ui_node.py +++ b/scripts/spdkcli/ui_node.py @@ -437,8 +437,8 @@ class UIPmemBdev(UIBdev): def ui_command_delete_pmem_pool(self, pmem_file): self.get_root().delete_pmem_pool(pmem_file=pmem_file) - def ui_command_pmem_pool_info(self, pmem_file): - ret = self.get_root().pmem_pool_info(pmem_file=pmem_file) + def ui_command_bdev_pmem_get_pool_info(self, pmem_file): + ret = self.get_root().bdev_pmem_get_pool_info(pmem_file=pmem_file) self.shell.log.info(json.dumps(ret, indent=2)) def ui_command_create(self, pmem_file, name): diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index a7b69fb9b..d67db31f3 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -215,8 +215,8 @@ class UIRoot(UINode): rpc.pmem.delete_pmem_pool(self.client, **kwargs) @verbose - def pmem_pool_info(self, **kwargs): - response = rpc.pmem.pmem_pool_info(self.client, **kwargs) + def bdev_pmem_get_pool_info(self, **kwargs): + response = rpc.pmem.bdev_pmem_get_pool_info(self.client, **kwargs) return response @verbose diff --git a/test/pmem/pmem.sh b/test/pmem/pmem.sh index ddb48e1e9..4be5ee430 100755 --- a/test/pmem/pmem.sh +++ b/test/pmem/pmem.sh @@ -30,7 +30,7 @@ function usage() echo echo "-h, --help Print help and exit" echo "-x set -x for script debug" - echo " --info Run test cases for pmem_pool_info" + echo " --info Run test cases for bdev_pmem_get_pool_info" echo " --create Run test cases for bdev_pmem_create_pool" echo " --delete Run test cases for delete_pmem_pool" echo " --construct_bdev Run test cases for constructing pmem bdevs" @@ -69,31 +69,31 @@ if [[ $EUID -ne 0 ]]; then fi #================================================ -# pmem_pool_info tests +# bdev_pmem_get_pool_info tests #================================================ -function pmem_pool_info_tc1() +function bdev_pmem_get_pool_info_tc1() { pmem_print_tc_name ${FUNCNAME[0]} - if $rpc_py pmem_pool_info; then - error "pmem_pool_info passed with missing argument!" + if $rpc_py bdev_pmem_get_pool_info; then + error "bdev_pmem_get_pool_info passed with missing argument!" fi return 0 } -function pmem_pool_info_tc2() +function bdev_pmem_get_pool_info_tc2() { pmem_print_tc_name ${FUNCNAME[0]} - if $rpc_py pmem_pool_info $rootdir/non/existing/path/non_existent_file; then - error "pmem_pool_info passed with invalid path!" + if $rpc_py bdev_pmem_get_pool_info $rootdir/non/existing/path/non_existent_file; then + error "bdev_pmem_get_pool_info passed with invalid path!" fi return 0 } -function pmem_pool_info_tc3() +function bdev_pmem_get_pool_info_tc3() { pmem_print_tc_name ${FUNCNAME[0]} pmem_clean_pool_file $obj_pool_file @@ -106,7 +106,7 @@ function pmem_pool_info_tc3() truncate -s "32M" $obj_pool_file fi - if $rpc_py pmem_pool_info $obj_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $obj_pool_file; then pmem_clean_pool_file $obj_pool_file error "Pmem_pool_info passed with invalid pool_file type!" fi @@ -115,14 +115,14 @@ function pmem_pool_info_tc3() return 0 } -function pmem_pool_info_tc4() +function bdev_pmem_get_pool_info_tc4() { pmem_print_tc_name ${FUNCNAME[0]} pmem_clean_pool_file pmem_create_pool_file - if ! $rpc_py pmem_pool_info $default_pool_file; then - error "Failed to get pmem_pool_info!" + if ! $rpc_py bdev_pmem_get_pool_info $default_pool_file; then + error "Failed to get bdev_pmem_get_pool_info!" fi pmem_clean_pool_file @@ -145,7 +145,7 @@ function bdev_pmem_create_pool_tc1() error "Mem pool file created w/out size & block size arguments!" fi - if $rpc_py pmem_pool_info $default_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "bdev_pmem_create_pool created invalid pool file!" fi @@ -153,7 +153,7 @@ function bdev_pmem_create_pool_tc1() error "Mem pool file created w/out block size argument!" fi - if $rpc_py pmem_pool_info $default_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "bdev_pmem_create_pool created invalid pool file!" fi @@ -170,7 +170,7 @@ function bdev_pmem_create_pool_tc2() error "Mem pool file created with incorrect path!" fi - if $rpc_py pmem_pool_info $rootdir/non/existing/path/non_existent_file; then + if $rpc_py bdev_pmem_get_pool_info $rootdir/non/existing/path/non_existent_file; then error "bdev_pmem_create_pool created invalid pool file!" fi @@ -187,7 +187,7 @@ function bdev_pmem_create_pool_tc3() error "Failed to create pmem pool!" fi - if ! $rpc_py pmem_pool_info $default_pool_file; then + if ! $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Failed to get pmem info" fi @@ -195,7 +195,7 @@ function bdev_pmem_create_pool_tc3() error "Failed to delete pool file!" fi - if $rpc_py pmem_pool_info $default_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Got pmem file info but file should be deleted" fi @@ -219,7 +219,7 @@ function bdev_pmem_create_pool_tc4() error "Failed to create pmem pool!" fi - if ! $rpc_py pmem_pool_info $rootdir/test/pmem/ramspace/pool_file; then + if ! $rpc_py bdev_pmem_get_pool_info $rootdir/test/pmem/ramspace/pool_file; then pmem_unmount_ramspace error "Failed to get pmem info" fi @@ -249,9 +249,9 @@ function bdev_pmem_create_pool_tc5() error "Failed to create pmem pool!" fi - if $rpc_py pmem_pool_info $default_pool_file; then - pmem_block_size=$($rpc_py pmem_pool_info $default_pool_file | jq -r '.[] .block_size') - pmem_num_block=$($rpc_py pmem_pool_info $default_pool_file | jq -r '.[] .num_blocks') + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then + pmem_block_size=$($rpc_py bdev_pmem_get_pool_info $default_pool_file | jq -r '.[] .block_size') + pmem_num_block=$($rpc_py bdev_pmem_get_pool_info $default_pool_file | jq -r '.[] .num_blocks') else error "Failed to get pmem info!" fi @@ -260,12 +260,12 @@ function bdev_pmem_create_pool_tc5() error "Pmem pool with already occupied path has been created!" fi - if $rpc_py pmem_pool_info $default_pool_file; then - if [ $pmem_block_size != $($rpc_py pmem_pool_info $default_pool_file | jq -r '.[] .block_size') ]; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then + if [ $pmem_block_size != $($rpc_py bdev_pmem_get_pool_info $default_pool_file | jq -r '.[] .block_size') ]; then error "Invalid block size of pmem pool!" fi - if [ $pmem_num_block != $($rpc_py pmem_pool_info $default_pool_file | jq -r '.[] .num_blocks') ]; then + if [ $pmem_num_block != $($rpc_py bdev_pmem_get_pool_info $default_pool_file | jq -r '.[] .num_blocks') ]; then error "Invalid number of blocks of pmem pool!" fi else @@ -292,7 +292,7 @@ function bdev_pmem_create_pool_tc6() error "Failed to create pmem pool!" fi - created_pmem_block_size=$($rpc_py pmem_pool_info $default_pool_file | jq -r '.[] .block_size') + created_pmem_block_size=$($rpc_py bdev_pmem_get_pool_info $default_pool_file | jq -r '.[] .block_size') if [ $? != 0 ]; then error "Failed to get pmem info!" fi @@ -319,7 +319,7 @@ function bdev_pmem_create_pool_tc7() error "Created pmem pool with invalid size!" fi - if $rpc_py pmem_pool_info $default_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Pmem file shouldn' exist!" fi @@ -336,7 +336,7 @@ function bdev_pmem_create_pool_tc8() error "Created pmem pool with invalid block number!" fi - if $rpc_py pmem_pool_info $default_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Pmem file shouldn' exist!" fi @@ -353,7 +353,7 @@ function bdev_pmem_create_pool_tc9() error "Created pmem pool with negative block size number!" fi - if $rpc_py pmem_pool_info $default_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "bdev_pmem_create_pool create invalid pool file!" fi @@ -361,7 +361,7 @@ function bdev_pmem_create_pool_tc9() error "Created pmem pool with negative size number!" fi - if $rpc_py pmem_pool_info $default_pool_file; then + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "bdev_pmem_create_pool create invalid pool file!" fi @@ -412,7 +412,7 @@ function delete_pmem_pool_tc3() pmem_clean_pool_file pmem_create_pool_file - if ! $rpc_py pmem_pool_info $default_pool_file; then + if ! $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Failed to get info on pmem pool file!" fi @@ -420,8 +420,8 @@ function delete_pmem_pool_tc3() error "Failed to delete pmem pool file!" fi - if $rpc_py pmem_pool_info $default_pool_file; then - error "Pmem pool file exists after using pmem_pool_info!" + if $rpc_py bdev_pmem_get_pool_info $default_pool_file; then + error "Pmem pool file exists after using bdev_pmem_get_pool_info!" fi return 0 @@ -520,7 +520,7 @@ function bdev_pmem_create_tc5() pmem_create_pool_file local pmem_bdev_name - if ! $rpc_py pmem_pool_info $default_pool_file; then + if ! $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Failed to get pmem info!" fi @@ -552,7 +552,7 @@ function bdev_pmem_create_tc6() pmem_clean_pool_file pmem_create_pool_file - if ! $rpc_py pmem_pool_info $default_pool_file; then + if ! $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Failed to get info on pmem pool file!" fi @@ -592,7 +592,7 @@ function delete_bdev_tc1() pmem_clean_pool_file pmem_create_pool_file $default_pool_file 256 512 - if ! $rpc_py pmem_pool_info $default_pool_file; then + if ! $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Failed to get pmem info!" fi @@ -625,7 +625,7 @@ function delete_bdev_tc2() pmem_create_pool_file $default_pool_file 256 512 local pmem_bdev_name - if ! $rpc_py pmem_pool_info $default_pool_file; then + if ! $rpc_py bdev_pmem_get_pool_info $default_pool_file; then error "Failed to get pmem info!" fi @@ -657,10 +657,10 @@ if ! $enable_script_debug; then fi if $test_info || $test_all; then - pmem_pool_info_tc1 - pmem_pool_info_tc2 - pmem_pool_info_tc3 - pmem_pool_info_tc4 + bdev_pmem_get_pool_info_tc1 + bdev_pmem_get_pool_info_tc2 + bdev_pmem_get_pool_info_tc3 + bdev_pmem_get_pool_info_tc4 fi if $test_create || $test_all; then diff --git a/test/pmem/test_plan.md b/test/pmem/test_plan.md index 4514863ca..0d0e03b34 100644 --- a/test/pmem/test_plan.md +++ b/test/pmem/test_plan.md @@ -25,36 +25,36 @@ nvmf_tgt and iscsi_tgt applications. ## Functional tests -### pmem_pool_info +### bdev_pmem_get_pool_info -#### pmem_pool_info_tc1 +#### bdev_pmem_get_pool_info_tc1 Negative test for checking pmem pool file. Call with missing path argument. Steps & expected results: -- Call pmem_pool_info with missing path argument +- Call bdev_pmem_get_pool_info with missing path argument - Check that return code != 0 and error code = -#### pmem_pool_info_tc2 +#### bdev_pmem_get_pool_info_tc2 Negative test for checking pmem pool file. Call with non-existant path argument. Steps & expected results: -- Call pmem_pool_info with path argument that points to not existing file. +- Call bdev_pmem_get_pool_info with path argument that points to not existing file. - Check that return code != 0 and error code = ENODEV -#### pmem_pool_info_tc3 +#### bdev_pmem_get_pool_info_tc3 Negative test for checking pmem pool file. Call with other type of pmem pool file. Steps & expected results: - Using pmem utility tools create pool of OBJ type instead of BLK (if needed utility tools are not available - create random file in filesystem) -- Call pmem_pool_info and point to file created in previous step. +- Call bdev_pmem_get_pool_info and point to file created in previous step. - Check that return code != 0 and error code = ENODEV -#### pmem_pool_info_tc4 +#### bdev_pmem_get_pool_info_tc4 Positive test for checking pmem pool file. Call with existing pmem pool file. Steps & expected results: -- Call pmem_pool_info with path argument that points to existing file. +- Call bdev_pmem_get_pool_info with path argument that points to existing file. - Check that return code == 0 ### bdev_pmem_create_pool @@ -72,15 +72,15 @@ Call bdev_pmem_create_pool with missing arguments. Steps & expected results: - call bdev_pmem_create_pool without path argument - call return code != 0 -- call pmem_pool_info and check that pmem pool file was not created +- call bdev_pmem_get_pool_info and check that pmem pool file was not created - call return code != 0 - call bdev_pmem_create_pool with path but without size and block size arguments - call return code != 0 -- call pmem_pool_info and check that pmem pool file was not created +- call bdev_pmem_get_pool_info and check that pmem pool file was not created - call return code != 0 - call bdev_pmem_create_pool with path and size but without block size arguments - call return code != 0 -- call pmem_pool_info and check that pmem pool file was not created +- call bdev_pmem_get_pool_info and check that pmem pool file was not created - call return code != 0 #### bdev_pmem_create_pool_tc2 @@ -89,7 +89,7 @@ Call bdev_pmem_create_pool with non existing path argument. Steps & expected results: - call bdev_pmem_create_pool with path that does not exist - call return code != 0 -- call pmem_pool_info and check that pmem pool file was not created +- call bdev_pmem_get_pool_info and check that pmem pool file was not created - call return code != 0 #### bdev_pmem_create_pool_tc3 @@ -98,7 +98,7 @@ Steps & expected results: - call bdev_pmem_create_pool with correct path argument, blocksize=512 and total size=256MB - call return code = 0 -- call pmem_pool_info and check that pmem file was created +- call bdev_pmem_get_pool_info and check that pmem file was created - call return code = 0 - call delete_pmem_pool on previously created pmem - return code = 0 and no error code @@ -110,7 +110,7 @@ Steps & expected results: - call bdev_pmem_create_pool with correct path argument, blocksize=512 and total size=256MB - call return code = 0 -- call pmem_pool_info and check that pmem file was created +- call bdev_pmem_get_pool_info and check that pmem file was created - call return code = 0 - call delete_pmem_pool on previously created pmem - return code = 0 and no error code @@ -121,7 +121,7 @@ Steps & expected results: - call bdev_pmem_create_pool with correct path argument, blocksize=512 and total size=256MB - call return code = 0 -- call pmem_pool_info and check that pmem file was created +- call bdev_pmem_get_pool_info and check that pmem file was created - call return code = 0 - call bdev_pmem_create_pool with the same path argument as before, blocksize=4096 and total size=512MB @@ -137,7 +137,7 @@ Positive test case for creating pmem pool file with various block sizes. Steps & expected results: - call bdev_pmem_create_pool with correct path argument, total size=256MB with different block size arguments - 1, 511, 512, 513, 1024, 4096, 128k and 256k -- call pmem_pool_info on each of created pmem pool and check if it was created; +- call bdev_pmem_get_pool_info on each of created pmem pool and check if it was created; For pool files created with block size <512 their block size should be rounded up to 512; other pool files should have the same block size as specified in create command @@ -150,7 +150,7 @@ Steps & expected results: - call bdev_pmem_create_pool with correct path argument, block size=512 and total size less than 16MB - return code !=0 and error code !=0 -- call pmem_pool_info to verify pmem pool file was not created +- call bdev_pmem_get_pool_info to verify pmem pool file was not created - return code = 0 #### bdev_pmem_create_pool_tc8 @@ -159,7 +159,7 @@ Steps & expected results: - call bdev_pmem_create_pool with correct path argument, block size=128k and total size=30MB - return code !=0 and error code !=0 -- call pmem_pool_info to verify pmem pool file was not created +- call bdev_pmem_get_pool_info to verify pmem pool file was not created - return code = 0 ### delete_pmem_pool @@ -185,11 +185,11 @@ Positive test case for creating and deleting a pemem. Steps & expected results: - call bdev_pmem_create_pool with correct arguments - return code = 0 and no error code -- using pmem_pool_info check that pmem was created +- using bdev_pmem_get_pool_info check that pmem was created - return code = 0 and no error code - call delete_pmem_pool on previously created pmem - return code = 0 and no error code -- using pmem_pool_info check that pmem no longer exists +- using bdev_pmem_get_pool_info check that pmem no longer exists - return code !=0 and error code = ENODEV #### delete_pmem_pool_tc4 @@ -236,7 +236,7 @@ Positive test for constructing pmem bdev. Steps & expected results: - call bdev_pmem_create_pool with correct arguments - return code = 0, no errors -- call pmem_pool_info and check if pmem files exists +- call bdev_pmem_get_pool_info and check if pmem files exists - return code = 0, no errors - call bdev_pmem_create with with correct arguments to create a pmem bdev - return code = 0, no errors @@ -251,7 +251,7 @@ Negative test for constructing pmem bdevs twice on the same pmem. Steps & expected results: - call bdev_pmem_create_pool with correct arguments - return code = 0, no errors -- call pmem_pool_info and check if pmem files exists +- call bdev_pmem_get_pool_info and check if pmem files exists - return code = 0, no errors - call bdev_pmem_create with with correct arguments to create a pmem bdev - return code = 0, no errors @@ -273,7 +273,7 @@ Steps & expected results: - call bdev_pmem_create_pool with correct path argument, block size=512, total size=256M - return code = 0, no errors -- call pmem_pool_info and check if pmem file exists +- call bdev_pmem_get_pool_info and check if pmem file exists - return code = 0, no errors - call bdev_pmem_create and create a pmem bdev - return code = 0, no errors @@ -289,7 +289,7 @@ Steps & expected results: - call bdev_pmem_create_pool with correct path argument, block size=512, total size=256M - return code = 0, no errors -- call pmem_pool_info and check if pmem file exists +- call bdev_pmem_get_pool_info and check if pmem file exists - return code = 0, no errors - call bdev_pmem_create and create a pmem bdev - return code = 0, no errors diff --git a/test/spdkcli/pmem.sh b/test/spdkcli/pmem.sh index db25cac0e..4ab479035 100755 --- a/test/spdkcli/pmem.sh +++ b/test/spdkcli/pmem.sh @@ -21,8 +21,8 @@ $spdkcli_job "'/bdevs/pmemblk bdev_pmem_create_pool /tmp/sample_pmem0 32 512' '' " # Saving pmem pool info before they get claimed by /bdevs/pmemblk create -$rootdir/scripts/spdkcli.py /bdevs/pmemblk pmem_pool_info /tmp/sample_pmem0 >> $testdir/match_files/spdkcli_pmem_info.test -$rootdir/scripts/spdkcli.py /bdevs/pmemblk pmem_pool_info /tmp/sample_pmem1 >> $testdir/match_files/spdkcli_pmem_info.test +$rootdir/scripts/spdkcli.py /bdevs/pmemblk bdev_pmem_get_pool_info /tmp/sample_pmem0 >> $testdir/match_files/spdkcli_pmem_info.test +$rootdir/scripts/spdkcli.py /bdevs/pmemblk bdev_pmem_get_pool_info /tmp/sample_pmem1 >> $testdir/match_files/spdkcli_pmem_info.test $spdkcli_job "'/bdevs/pmemblk create /tmp/sample_pmem0 pmem_bdev0' 'pmem_bdev0' True '/bdevs/pmemblk create /tmp/sample_pmem1 pmem_bdev1' 'pmem_bdev1' True