Merge "compute: Skip AttachVolumeShelveTestJSON when cross_az_attach unavailable"

This commit is contained in:
Zuul 2020-12-08 16:59:33 +00:00 committed by Gerrit Code Review
commit d76d371e1d
1 changed files with 4 additions and 0 deletions

View File

@ -200,6 +200,10 @@ class AttachVolumeShelveTestJSON(BaseAttachVolumeTest):
super(AttachVolumeShelveTestJSON, cls).skip_checks()
if not CONF.compute_feature_enabled.shelve:
raise cls.skipException('Shelve is not available.')
if CONF.compute.compute_volume_common_az:
# assuming cross_az_attach is set to false in nova.conf
# per the compute_volume_common_az option description
raise cls.skipException('Cross AZ attach not available.')
def _count_volumes(self, server, validation_resources):
# Count number of volumes on an instance