From e37c3c50e638d5f628d658b36e41c3310f2ba505 Mon Sep 17 00:00:00 2001

From: Jeffrey Cody <jcody@redhat.com>

Date: Mon, 8 May 2017 22:11:14 +0200

Subject: [PATCH 4/7] block/vxhs.c: Add qemu-iotests for new block device type

 "vxhs"

RH-Author: Jeffrey Cody <jcody@redhat.com>

Message-id: <3384a73672d5f90523c0ed394b332e82ec760d45.1494281291.git.jcody@redhat.com>

Patchwork-id: 75047

O-Subject: [RHEV-7.4 qemu-kvm-rhev 2/4] block/vxhs.c: Add qemu-iotests for new block device type "vxhs"

Bugzilla: 1265869

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Ashish Mittal <ashmit602@gmail.com>

These changes use a vxhs test server that is a part of the following

repository:

https://github.com/VeritasHyperScale/libqnio.git

Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com>

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

Signed-off-by: Jeff Cody <jcody@redhat.com>

Message-id: 1491277689-24949-3-git-send-email-Ashish.Mittal@veritas.com

(cherry picked from commit ae0c0a3decabba6b710d8e6902d43495f7490de2)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 tests/qemu-iotests/common        |  6 ++++++

 tests/qemu-iotests/common.config | 13 +++++++++++++

 tests/qemu-iotests/common.filter |  1 +

 tests/qemu-iotests/common.rc     | 19 +++++++++++++++++++

 4 files changed, 39 insertions(+)

diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common

index 4d5650d..9c6f972 100644

--- a/tests/qemu-iotests/common

+++ b/tests/qemu-iotests/common

@@ -157,6 +157,7 @@ check options

     -ssh                test ssh

     -nfs                test nfs

     -luks               test luks

+    -vxhs               test vxhs

     -xdiff              graphical mode diff

     -nocache            use O_DIRECT on backing file

     -misalign           misalign memory allocations

@@ -260,6 +261,11 @@ testlist options

             xpand=false

             ;;

+        -vxhs)

+            IMGPROTO=vxhs

+            xpand=false

+            ;;

+

         -ssh)

             IMGPROTO=ssh

             xpand=false

diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config

index 55527aa..c4b51b3 100644

--- a/tests/qemu-iotests/common.config

+++ b/tests/qemu-iotests/common.config

@@ -105,6 +105,10 @@ if [ -z "$QEMU_NBD_PROG" ]; then

     export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"

 fi

+if [ -z "$QEMU_VXHS_PROG" ]; then

+    export QEMU_VXHS_PROG="`set_prog_path qnio_server`"

+fi

+

 _qemu_wrapper()

 {

     (

@@ -156,10 +160,19 @@ _qemu_nbd_wrapper()

     )

 }

+_qemu_vxhs_wrapper()

+{

+    (

+        echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid"

+        exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@"

+    )

+}

+

 export QEMU=_qemu_wrapper

 export QEMU_IMG=_qemu_img_wrapper

 export QEMU_IO=_qemu_io_wrapper

 export QEMU_NBD=_qemu_nbd_wrapper

+export QEMU_VXHS=_qemu_vxhs_wrapper

 QEMU_IMG_EXTRA_ARGS=

 if [ "$IMGOPTSSYNTAX" = "true" ]; then

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter

index 1040013..c9a2d5c 100644

--- a/tests/qemu-iotests/common.filter

+++ b/tests/qemu-iotests/common.filter

@@ -122,6 +122,7 @@ _filter_img_info()

         -e "s#$TEST_DIR#TEST_DIR#g" \

         -e "s#$IMGFMT#IMGFMT#g" \

         -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \

+        -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \

         -e "/encrypted: yes/d" \

         -e "/cluster_size: [0-9]\\+/d" \

         -e "/table_size: [0-9]\\+/d" \

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc

index 7d4781d..62529ee 100644

--- a/tests/qemu-iotests/common.rc

+++ b/tests/qemu-iotests/common.rc

@@ -85,6 +85,9 @@ else

     elif [ "$IMGPROTO" = "nfs" ]; then

         TEST_DIR="nfs://127.0.0.1/$TEST_DIR"

         TEST_IMG=$TEST_DIR/t.$IMGFMT

+    elif [ "$IMGPROTO" = "vxhs" ]; then

+        TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT

+        TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"

     else

         TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT

     fi

@@ -171,6 +174,12 @@ _make_test_img()

         eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"

         sleep 1 # FIXME: qemu-nbd needs to be listening before we continue

     fi

+

+    # Start QNIO server on image directory for vxhs protocol

+    if [ $IMGPROTO = "vxhs" ]; then

+        eval "$QEMU_VXHS -d  $TEST_DIR > /dev/null &"

+        sleep 1 # Wait for server to come up.

+    fi

 }

 _rm_test_img()

@@ -197,6 +206,16 @@ _cleanup_test_img()

             fi

             rm -f "$TEST_IMG_FILE"

             ;;

+        vxhs)

+            if [ -f "${TEST_DIR}/qemu-vxhs.pid" ]; then

+                local QEMU_VXHS_PID

+                read QEMU_VXHS_PID < "${TEST_DIR}/qemu-vxhs.pid"

+                kill ${QEMU_VXHS_PID} >/dev/null 2>&1

+                rm -f "${TEST_DIR}/qemu-vxhs.pid"

+            fi

+            rm -f "$TEST_IMG_FILE"

+            ;;

+

         file)

             _rm_test_img "$TEST_DIR/t.$IMGFMT"

             _rm_test_img "$TEST_DIR/t.$IMGFMT.orig"

-- 

1.8.3.1