From d5919d08ba131ac2bde27251c8b4e77bf428e876 Mon Sep 17 00:00:00 2001 From: "jeremy.zhang" Date: Wed, 8 Mar 2017 15:27:37 +0800 Subject: [PATCH] Restrict enabling the manage_volume volume feature Not all Cinder backends support the 'manage volume' feature. The test that in tempest for this feature is specific to LVM and will *not* work for other work backends regardless of them supporting the feature. Change-Id: I055aa66738deb5ae2fb925429cec565e3901340c --- lib/tempest | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/tempest b/lib/tempest index d95a9f5c3d..95b25bcf4e 100644 --- a/lib/tempest +++ b/lib/tempest @@ -439,7 +439,11 @@ function configure_tempest { TEMPEST_VOLUME_MANAGE_SNAPSHOT=${TEMPEST_VOLUME_MANAGE_SNAPSHOT:-True} fi iniset $TEMPEST_CONFIG volume-feature-enabled manage_snapshot $(trueorfalse False TEMPEST_VOLUME_MANAGE_SNAPSHOT) - + # Only turn on TEMPEST_VOLUME_MANAGE_VOLUME by default for "lvm" backends + if [[ "$CINDER_ENABLED_BACKENDS" == *"lvm"* ]]; then + TEMPEST_VOLUME_MANAGE_VOLUME=${TEMPEST_VOLUME_MANAGE_VOLUME:-True} + fi + iniset $TEMPEST_CONFIG volume-feature-enabled manage_volume $(trueorfalse False TEMPEST_VOLUME_MANAGE_VOLUME) # TODO(ameade): Remove the api_v3 flag when Mitaka and Liberty are end of life. iniset $TEMPEST_CONFIG volume-feature-enabled api_v3 True iniset $TEMPEST_CONFIG volume-feature-enabled api_v1 $(trueorfalse False TEMPEST_VOLUME_API_V1)