Merge "Encap netaddr-0.7.16"
diff --git a/tempest/api/volume/test_volumes_get.py b/tempest/api/volume/test_volumes_get.py
index 9db2321..db156f0 100644
--- a/tempest/api/volume/test_volumes_get.py
+++ b/tempest/api/volume/test_volumes_get.py
@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import testtools
from testtools import matchers
from tempest.api.volume import base
@@ -138,6 +139,8 @@
imageRef=CONF.compute.image_ref, size=disk_size)
@test.idempotent_id('3f591b4a-7dc6-444c-bd51-77469506b3a1')
+ @testtools.skipUnless(CONF.volume_feature_enabled.clone,
+ 'Cinder volume clones are disabled')
def test_volume_create_get_update_delete_as_clone(self):
origin = self.create_volume()
self._volume_create_get_update_delete(source_volid=origin['id'])
diff --git a/tempest/config.py b/tempest/config.py
index b5f1de1..b6daa2e 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -702,6 +702,9 @@
cfg.BoolOpt('snapshot',
default=True,
help='Runs Cinder volume snapshot test'),
+ cfg.BoolOpt('clone',
+ default=True,
+ help='Runs Cinder volume clone test'),
cfg.ListOpt('api_extensions',
default=['all'],
help='A list of enabled volume extensions with a special '
diff --git a/tempest/scenario/test_minimum_basic.py b/tempest/scenario/test_minimum_basic.py
index c38ce2d..31459cb 100644
--- a/tempest/scenario/test_minimum_basic.py
+++ b/tempest/scenario/test_minimum_basic.py
@@ -63,9 +63,12 @@
def nova_show(self):
got_server = self.servers_client.show_server(self.server['id'])
+ excluded_keys = ['OS-EXT-AZ:availability_zone']
+ # Exclude these keys because of LP:#1486475
+ excluded_keys.extend(['OS-EXT-STS:power_state', 'updated'])
self.assertThat(
self.server, custom_matchers.MatchesDictExceptForKeys(
- got_server, excluded_keys=['OS-EXT-AZ:availability_zone']))
+ got_server, excluded_keys=excluded_keys))
def cinder_create(self):
self.volume = self.create_volume()
diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index 4912033..0066213 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -11,6 +11,7 @@
# under the License.
from oslo_log import log
+from tempest_lib import decorators
from tempest.common.utils import data_utils
from tempest.common import waiters
@@ -176,6 +177,7 @@
# deletion operations to succeed
self._stop_instances([instance_2nd, instance_from_snapshot])
+ @decorators.skip_because(bug='1489581')
@test.idempotent_id('36c34c67-7b54-4b59-b188-02a2f458a63b')
@test.services('compute', 'volume', 'image')
def test_create_ebs_image_and_check_boot(self):