Skip to content

Commit

Permalink
update mgmt suite test to use client pool list
Browse files Browse the repository at this point in the history
Test-tag: pr, ListClientPoolsTest
Signed-off-by: Michael MacDonald <mjmac@google.com>
  • Loading branch information
mjmac committed Jun 27, 2024
1 parent e56b693 commit e092306
Showing 1 changed file with 12 additions and 24 deletions.
36 changes: 12 additions & 24 deletions src/tests/suite/daos_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ find_pool(void **state, daos_mgmt_pool_info_t *pool)
}

/* Verify pool info returned by DAOS API
* rc_ret: return code from dmg_list_pool()
* npools_in: npools input argument to dmg_list_pool()
* npools_out: npools output argument value after dmg_list_pool()
* rc_ret: return code from daos_mgmt_list_pools()
* npools_in: npools input argument to daos_mgmt_list_pools()
* npools_out: npools output argument value after daos_mgmt_list_pools()
*/
static void
verify_pool_info(void **state, int rc_ret, daos_size_t npools_in,
Expand Down Expand Up @@ -272,13 +272,13 @@ list_pools_test(void **state)
/***** Test: retrieve number of pools in system *****/
npools = npools_orig = 0xABC0; /* Junk value (e.g., uninitialized) */
/* test only */
rc = dmg_pool_list(dmg_config_file, arg->group, &npools, NULL);
rc = daos_mgmt_list_pools(arg->group, &npools, NULL, NULL);
assert_rc_equal(rc, 0);
verify_pool_info(state, rc, npools_orig, NULL /* pools */, npools);
print_message("success t%d: output npools=%zu\n", tnum++,
lparg->nsyspools);

/* Setup for next 2 tests: alloc pools[] */
/* Setup for next test: alloc pools[] */
npools_alloc = lparg->nsyspools + 10;
D_ALLOC_ARRAY(pools, npools_alloc);
assert_ptr_not_equal(pools, NULL);
Expand All @@ -287,29 +287,18 @@ list_pools_test(void **state)
* and that many items in pools[] filled
*****/
npools = npools_alloc;
rc = dmg_pool_list(dmg_config_file, arg->group, &npools, pools);
rc = daos_mgmt_list_pools(arg->group, &npools, pools, NULL);
assert_rc_equal(rc, 0);
verify_pool_info(state, rc, npools_alloc, pools, npools);
clean_pool_info(npools_alloc, pools);
print_message("success t%d: pools[] over-sized\n", tnum++);

/***** Test: provide npools=0, non-NULL pools ****/
npools = 0;
rc = dmg_pool_list(dmg_config_file, arg->group, &npools, pools);
if (lparg->nsyspools > 0)
assert_rc_equal(rc, -DER_TRUNC);
else
assert_rc_equal(rc, 0);
assert_int_equal(npools, lparg->nsyspools);
print_message("success t%d: npools=0, non-NULL pools[] rc=%d\n",
tnum++, rc);

/* Teardown for above 2 tests */
/* Teardown for above test */
D_FREE(pools); /* clean_pool_info() freed mgpi_svc */
pools = NULL;

/***** Test: invalid npools=NULL *****/
rc = dmg_pool_list(dmg_config_file, arg->group, NULL, NULL);
rc = daos_mgmt_list_pools(arg->group, NULL, NULL, NULL);
assert_rc_equal(rc, -DER_INVAL);
print_message("success t%d: in &npools NULL, -DER_INVAL\n", tnum++);

Expand All @@ -324,7 +313,7 @@ list_pools_test(void **state)

/* Test: Exact size buffer */
npools = npools_alloc;
rc = dmg_pool_list(dmg_config_file, arg->group, &npools, pools);
rc = daos_mgmt_list_pools(arg->group, &npools, pools, NULL);
assert_rc_equal(rc, 0);
verify_pool_info(state, rc, npools_alloc, pools, npools);

Expand All @@ -333,17 +322,16 @@ list_pools_test(void **state)
pools = NULL;
print_message("success t%d: pools[] exact length\n", tnum++);

/***** Test: Under-sized buffer (negative) -DER_TRUNC *****/
/***** Test: Under-sized buffer (negative) -DER_OVERFLOW *****/
/* Setup */
npools_alloc = lparg->nsyspools - 1;
D_ALLOC_ARRAY(pools, npools_alloc);
assert_ptr_not_equal(pools, NULL);

/* Test: Under-sized buffer */
npools = npools_alloc;
rc = dmg_pool_list(dmg_config_file, arg->group, &npools, pools);
assert_rc_equal(rc, -DER_TRUNC);
verify_pool_info(state, rc, npools_alloc, pools, npools);
rc = daos_mgmt_list_pools(arg->group, &npools, pools, NULL);
assert_rc_equal(rc, -DER_OVERFLOW);
print_message("success t%d: pools[] under-sized\n", tnum++);

/* Teardown */
Expand Down

0 comments on commit e092306

Please sign in to comment.