From 27a819cfea29ec903b44cea984b483f61ad61e10 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 24 Jun 2018 13:54:01 +0200 Subject: Fix hardcoded values in cinder_test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only Fuel attaches a kdrive in all cases and then increase the device numbers. cinder_test now leverages on VOLUME_DEVICE_NAME as tempest. It also updates the testcase to leverage on the right scenario. Change-Id: Ib5cd17f69411f608f1b79e704604dc481581ebe0 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/cinder/read_data.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'functest/opnfv_tests/openstack/cinder/read_data.sh') diff --git a/functest/opnfv_tests/openstack/cinder/read_data.sh b/functest/opnfv_tests/openstack/cinder/read_data.sh index c3ce9e4f7..e6ad57bd3 100644 --- a/functest/opnfv_tests/openstack/cinder/read_data.sh +++ b/functest/opnfv_tests/openstack/cinder/read_data.sh @@ -9,9 +9,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 DEST=$(mktemp -d) -VOL_DEV_NAME="$(lsblk -l -o NAME | grep -o "vdc\|sdc\b")" +VOL_DEV_NAME=${1:-vdb} echo "VOL_DEV_NAME: $VOL_DEV_NAME" +echo "$(lsblk -l -o NAME)" if [ ! -z $VOL_DEV_NAME ]; then sudo mount /dev/$VOL_DEV_NAME $DEST if [ -f $DEST/new_data ]; then @@ -21,3 +22,5 @@ if [ ! -z $VOL_DEV_NAME ]; then exit 1 fi fi + +exit 0 -- cgit 1.2.3-korg