From e9a9fbef8fc29437d1f69727e2ab73c31e957488 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 30 Jan 2017 22:22:43 -0500 Subject: [PATCH] Don't run swap_volume tests in Tempest if cells v1 is enabled Cells v1 apparently doesn't support the swap volume API which was recently enabled for testing in change: 92575baa6b010ec09fea3e715030da8be61c0c64 Rather than revert that change, we should just handle the cells v1 case and not enable that test in that environment. Change-Id: I80f52e8299641098d90d3c374a80770fc45b8122 Closes-Bug: #1660511 --- lib/tempest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tempest b/lib/tempest index 050ac382c5..7cafadbf3f 100644 --- a/lib/tempest +++ b/lib/tempest @@ -516,8 +516,10 @@ function configure_tempest { iniset $TEMPEST_CONFIG compute-feature-enabled shelve False iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False iniset $TEMPEST_CONFIG compute-feature-enabled suspend False + elif ! is_service_enabled n-cell; then + # cells v1 does not support swapping volumes + iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True fi - iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True fi # ``service_available``