aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/cinder/read_data.sh
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-06-24 13:54:01 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-06-24 13:55:35 +0200
commit27a819cfea29ec903b44cea984b483f61ad61e10 (patch)
tree5a7efc61b683b41db13362f9f30052f874634afc /functest/opnfv_tests/openstack/cinder/read_data.sh
parentd2bf2e00eaedb5113f4baee3a707aa026dd1c18d (diff)
Fix hardcoded values in cinder_test
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 <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/cinder/read_data.sh')
-rw-r--r--functest/opnfv_tests/openstack/cinder/read_data.sh5
1 files changed, 4 insertions, 1 deletions
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