diff --git a/scripts/rpc.py b/scripts/rpc.py index b13f44941..f1f696e75 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1049,7 +1049,11 @@ if __name__ == "__main__": # pmem @call_cmd def create_pmem_pool(args): - rpc.pmem.create_pmem_pool(args.client, args) + num_blocks = int((args.total_size * 1024 * 1024) / args.block_size) + rpc.pmem.create_pmem_pool(args.client, + pmem_file=args.pmem_file, + num_blocks=num_blocks, + block_size=args.block_size) p = subparsers.add_parser('create_pmem_pool', help='Create pmem pool') p.add_argument('pmem_file', help='Path to pmemblk pool file') @@ -1059,7 +1063,8 @@ if __name__ == "__main__": @call_cmd def pmem_pool_info(args): - print_dict(rpc.pmem.pmem_pool_info(args.client, args)) + print_dict(rpc.pmem.pmem_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.add_argument('pmem_file', help='Path to pmemblk pool file') @@ -1067,7 +1072,8 @@ if __name__ == "__main__": @call_cmd def delete_pmem_pool(args): - rpc.pmem.delete_pmem_pool(args.client, args) + rpc.pmem.delete_pmem_pool(args.client, + pmem_file=args.pmem_file) p = subparsers.add_parser('delete_pmem_pool', help='Delete pmem pool') p.add_argument('pmem_file', help='Path to pmemblk pool file') diff --git a/scripts/rpc/pmem.py b/scripts/rpc/pmem.py index cd01fc61c..4ab38ff31 100755 --- a/scripts/rpc/pmem.py +++ b/scripts/rpc/pmem.py @@ -1,17 +1,29 @@ -def create_pmem_pool(client, args): - # truncate to the nearest block. - num_blocks = int((args.total_size * 1024 * 1024) / args.block_size) - params = {'pmem_file': args.pmem_file, +def create_pmem_pool(client, pmem_file, num_blocks, block_size): + """Create pmem pool at specified path. + Args: + pmem_file: path at which to create pmem pool + num_blocks: number of blocks for created pmem pool file + block_size: block size for pmem pool file + """ + params = {'pmem_file': pmem_file, 'num_blocks': num_blocks, - 'block_size': args.block_size} + 'block_size': block_size} return client.call('create_pmem_pool', params) -def pmem_pool_info(client, args): - params = {'pmem_file': args.pmem_file} +def pmem_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) -def delete_pmem_pool(client, args): - params = {'pmem_file': args.pmem_file} +def delete_pmem_pool(client, pmem_file): + """Delete pmem pool. + Args: + pmem_file: path to pmem pool + """ + params = {'pmem_file': pmem_file} return client.call('delete_pmem_pool', params)