tempest: configure compute-feature-enabled.swap_volume if libvirt

The only virt driver in nova that supports the swap volume API is
libvirt so enable testing that in Tempest only if using libvirt.

Depends on two changes:

1. The Tempest change that adds the new config option and test.

Depends-On: I2d4779de8d21aa84533f4f92d347e932db2de58e

2. A nova fix for correctly waiting for the block copy job in the guest
   to complete.

I0c52917a5555a70c4973f37dea1aebf878dd73b4

NOTE(mriedem): The backport here does not have a Depends-On for the
nova fix since there is an open WIP backport to stable/mitaka which
we don't plan to merge and leaving that with Depends-On will mean this
backport couldn't merge. So we just note it for reference but don't
actually depend on it. The stable/newton fix for nova is merged though.

Change-Id: Ibb6b309574d2c6a06fcecb0626ea21527fb7f412
(cherry picked from commit 92575baa6b)
This commit is contained in:
Matt Riedemann 2016-09-21 16:15:31 -04:00 committed by Matt Riedemann
parent 797e37d449
commit 080d8e3a7f
1 changed files with 11 additions and 7 deletions

View File

@ -513,13 +513,17 @@ function configure_tempest {
iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
fi
# Libvirt-LXC
if [ "$VIRT_DRIVER" = "libvirt" ] && [ "$LIBVIRT_TYPE" = "lxc" ]; then
iniset $TEMPEST_CONFIG compute-feature-enabled rescue False
iniset $TEMPEST_CONFIG compute-feature-enabled resize False
iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False
iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
# Libvirt
if [ "$VIRT_DRIVER" = "libvirt" ]; then
# Libvirt-LXC
if [ "$LIBVIRT_TYPE" = "lxc" ]; then
iniset $TEMPEST_CONFIG compute-feature-enabled rescue False
iniset $TEMPEST_CONFIG compute-feature-enabled resize False
iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False
iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
fi
iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True
fi
# ``service_available``