Browse code

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.

Depends-On: I0c52917a5555a70c4973f37dea1aebf878dd73b4

Change-Id: Ibb6b309574d2c6a06fcecb0626ea21527fb7f412

Matt Riedemann authored on 2016/09/22 05:15:31
Showing 1 changed files
... ...
@@ -508,13 +508,17 @@ function configure_tempest {
508 508
         iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
509 509
     fi
510 510
 
511
-    # Libvirt-LXC
512
-    if [ "$VIRT_DRIVER" = "libvirt" ] && [ "$LIBVIRT_TYPE" = "lxc" ]; then
513
-        iniset $TEMPEST_CONFIG compute-feature-enabled rescue False
514
-        iniset $TEMPEST_CONFIG compute-feature-enabled resize False
515
-        iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
516
-        iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False
517
-        iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
511
+    # Libvirt
512
+    if [ "$VIRT_DRIVER" = "libvirt" ]; then
513
+        # Libvirt-LXC
514
+        if [ "$LIBVIRT_TYPE" = "lxc" ]; then
515
+            iniset $TEMPEST_CONFIG compute-feature-enabled rescue False
516
+            iniset $TEMPEST_CONFIG compute-feature-enabled resize False
517
+            iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
518
+            iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False
519
+            iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
520
+        fi
521
+        iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True
518 522
     fi
519 523
 
520 524
     # ``service_available``