qemu-iotests: add support for Archipelago protocol
Signed-off-by: Chrysostomos Nanakos <cnanakos@grnet.gr> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
b1de5f439d
commit
746ebfa77a
|
@ -152,6 +152,7 @@ check options
|
||||||
-nbd test nbd
|
-nbd test nbd
|
||||||
-ssh test ssh
|
-ssh test ssh
|
||||||
-nfs test nfs
|
-nfs test nfs
|
||||||
|
-archipelago test archipelago
|
||||||
-xdiff graphical mode diff
|
-xdiff graphical mode diff
|
||||||
-nocache use O_DIRECT on backing file
|
-nocache use O_DIRECT on backing file
|
||||||
-misalign misalign memory allocations
|
-misalign misalign memory allocations
|
||||||
|
@ -263,6 +264,11 @@ testlist options
|
||||||
xpand=false
|
xpand=false
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
-archipelago)
|
||||||
|
IMGPROTO=archipelago
|
||||||
|
xpand=false
|
||||||
|
;;
|
||||||
|
|
||||||
-nocache)
|
-nocache)
|
||||||
CACHEMODE="none"
|
CACHEMODE="none"
|
||||||
CACHEMODE_IS_DEFAULT=false
|
CACHEMODE_IS_DEFAULT=false
|
||||||
|
|
|
@ -64,6 +64,8 @@ elif [ "$IMGPROTO" = "ssh" ]; then
|
||||||
elif [ "$IMGPROTO" = "nfs" ]; then
|
elif [ "$IMGPROTO" = "nfs" ]; then
|
||||||
TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
|
TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
|
||||||
TEST_IMG=$TEST_DIR/t.$IMGFMT
|
TEST_IMG=$TEST_DIR/t.$IMGFMT
|
||||||
|
elif [ "$IMGPROTO" = "archipelago" ]; then
|
||||||
|
TEST_IMG="archipelago:at.$IMGFMT"
|
||||||
else
|
else
|
||||||
TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
|
TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
|
||||||
fi
|
fi
|
||||||
|
@ -163,7 +165,8 @@ _make_test_img()
|
||||||
-e "s# lazy_refcounts=\\(on\\|off\\)##g" \
|
-e "s# lazy_refcounts=\\(on\\|off\\)##g" \
|
||||||
-e "s# block_size=[0-9]\\+##g" \
|
-e "s# block_size=[0-9]\\+##g" \
|
||||||
-e "s# block_state_zero=\\(on\\|off\\)##g" \
|
-e "s# block_state_zero=\\(on\\|off\\)##g" \
|
||||||
-e "s# log_size=[0-9]\\+##g"
|
-e "s# log_size=[0-9]\\+##g" \
|
||||||
|
-e "s/archipelago:a/TEST_DIR\//g"
|
||||||
|
|
||||||
# Start an NBD server on the image file, which is what we'll be talking to
|
# Start an NBD server on the image file, which is what we'll be talking to
|
||||||
if [ $IMGPROTO = "nbd" ]; then
|
if [ $IMGPROTO = "nbd" ]; then
|
||||||
|
@ -206,6 +209,10 @@ _cleanup_test_img()
|
||||||
rbd --no-progress rm "$TEST_DIR/t.$IMGFMT" > /dev/null
|
rbd --no-progress rm "$TEST_DIR/t.$IMGFMT" > /dev/null
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
archipelago)
|
||||||
|
vlmc remove "at.$IMGFMT" > /dev/null
|
||||||
|
;;
|
||||||
|
|
||||||
sheepdog)
|
sheepdog)
|
||||||
collie vdi delete "$TEST_DIR/t.$IMGFMT"
|
collie vdi delete "$TEST_DIR/t.$IMGFMT"
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in a new issue