Commit 134dce26 authored by Cunyin Chang's avatar Cunyin Chang Committed by Daniel Verkamp
Browse files

rpc: Rename construct_malloc_lun to construct_malloc_bdev 



Change-Id: I72f21881264226499a9cd64c72f3ab1b4808b2ec
Signed-off-by: default avatarCunyin Chang <cunyin.chang@intel.com>
parent 83620f4e

lib/bdev/malloc/blockdev_malloc_rpc.c

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const struct spdk_json_object_decoder rpc_construct_malloc_decoders[] = { 
};



static void

spdk_rpc_construct_malloc_lun(struct spdk_jsonrpc_server_conn *conn,

spdk_rpc_construct_malloc_bdev(struct spdk_jsonrpc_server_conn *conn,

			       const struct spdk_json_val *params,

			       const struct spdk_json_val *id)

{
@@ -76,4 +76,4 @@ spdk_rpc_construct_malloc_lun(struct spdk_jsonrpc_server_conn *conn, 
invalid:

	spdk_jsonrpc_send_error_response(conn, id, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");

}

SPDK_RPC_REGISTER("construct_malloc_lun", spdk_rpc_construct_malloc_lun)
 
SPDK_RPC_REGISTER("construct_malloc_bdev", spdk_rpc_construct_malloc_bdev)

scripts/rpc.py

+6 −6
Original line number Diff line number Diff line
@@ -143,15 +143,15 @@ p.add_argument('chap_auth_group', help="""Authentication group ID for this targe 
p.set_defaults(func=construct_target_node)





def construct_malloc_lun(args):

def construct_malloc_bdev(args):

    num_blocks = (args.total_size * 1024 * 1024) / args.block_size

    params = {'num_blocks': num_blocks, 'block_size': args.block_size}

    jsonrpc_call('construct_malloc_lun', params)

    jsonrpc_call('construct_malloc_bdev', params)



p = subparsers.add_parser('construct_malloc_lun', help='Add a LUN with malloc backend')

p.add_argument('total_size', help='Size of malloc LUN in MB (int > 0)', type=int)

p.add_argument('block_size', help='Block size for this LUN', type=int)

p.set_defaults(func=construct_malloc_lun)

p = subparsers.add_parser('construct_malloc_bdev', help='Add a bdev with malloc backend')

p.add_argument('total_size', help='Size of malloc bdev in MB (int > 0)', type=int)

p.add_argument('block_size', help='Block size for this bdev', type=int)

p.set_defaults(func=construct_malloc_bdev)





def construct_aio_lun(args):

test/iscsi_tgt/calsoft/calsoft.sh

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ RPC_PORT=5260 
INITIATOR_TAG=2

INITIATOR_NAME=ALL

NETMASK=$INITIATOR_IP/32

MALLOC_LUN_SIZE=64

MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=512



rpc_py="python $rootdir/scripts/rpc.py"
@@ -42,7 +42,7 @@ echo "iscsi_tgt is listening. Running tests..." 


$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_lun $MALLOC_LUN_SIZE $MALLOC_BLOCK_SIZE

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64

test/iscsi_tgt/filesystem/filesystem.sh

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ RPC_PORT=5260 
INITIATOR_TAG=2

INITIATOR_NAME=ALL

NETMASK=$INITIATOR_IP/32

MALLOC_LUN_SIZE=256

MALLOC_BDEV_SIZE=256

MALLOC_BLOCK_SIZE=512



rpc_py="python $rootdir/scripts/rpc.py"
@@ -38,7 +38,7 @@ echo "iscsi_tgt is listening. Running tests..." 


$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_lun $MALLOC_LUN_SIZE $MALLOC_BLOCK_SIZE

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64

test/iscsi_tgt/fio/fio.sh

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ RPC_PORT=5260 
INITIATOR_TAG=2

INITIATOR_NAME=ALL

NETMASK=$INITIATOR_IP/32

MALLOC_LUN_SIZE=64

MALLOC_BDEV_SIZE=64

MALLOC_BLOCK_SIZE=4096



rpc_py="python $rootdir/scripts/rpc.py"
@@ -61,7 +61,7 @@ echo "iscsi_tgt is listening. Running tests..." 


$rpc_py add_portal_group 1 $TARGET_IP:$PORT

$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

$rpc_py construct_malloc_lun $MALLOC_LUN_SIZE $MALLOC_BLOCK_SIZE

$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE

# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

# "1:2" ==> map PortalGroup1 to InitiatorGroup2

# "64" ==> iSCSI queue depth 64