openstack/tempest
Code Issues Proposed changes

Make rescue, volume attachment compute tests to use SSH-able server

Browse Source 
As you can see the details in bug#1960346, volume detach fails
on centos 9 stream while server is not fully booted. This
commit makes sure that erver creation as well as after the unrescue
server test wait for the server to be SSH-able before test start
performing the detach operation in cleanup.

Related-Bug: #1960346
Change-Id: Ib21a764e3cf81d761d738bf7bfaf5c264b739a16
This commit is contained in:
Ghanshyam Mann
2022-03-18 10:04:07 -05:00
parent 8c6d0cf520
commit 6fa213cc0f
2 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tempest/api/compute/admin/test_volume.py
+8 -4
View File
@@ -85,10 +85,14 @@ class AttachSCSIVolumeTestJSON(BaseAttachSCSIVolumeTest):
hw_scsi_model='virtio-scsi',
hw_disk_bus='scsi',
hw_cdrom_bus='scsi')
server = self.create_test_server(image_id=custom_img,
config_drive=True,
wait_until='ACTIVE')
validation_resources = self.get_test_validation_resources(
self.os_primary)
server = self.create_test_server(
image_id=custom_img,
config_drive=True,
validatable=True,
validation_resources=validation_resources,
wait_until="SSHABLE")
# NOTE(lyarwood): self.create_test_server delete the server
# at class level cleanup so add server cleanup to ensure that
# the instance is deleted first before created image. This
tempest/api/compute/servers/test_server_rescue_negative.py
+29 -7
View File
@@ -16,6 +16,7 @@
import testtools
from tempest.api.compute import base
from tempest.common import compute
from tempest.common import utils
from tempest.common import waiters
from tempest import config
@@ -38,7 +39,8 @@ class ServerRescueNegativeTestJSON(base.BaseV2ComputeTest):
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
cls.set_network_resources(network=True, subnet=True, router=True,
dhcp=True)
super(ServerRescueNegativeTestJSON, cls).setup_credentials()
@classmethod
@@ -136,21 +138,41 @@ class ServerRescueNegativeTestJSON(base.BaseV2ComputeTest):
def test_rescued_vm_detach_volume(self):
"""Test detaching volume from a rescued server should fail"""
volume = self.create_volume()
# This test just check detach fail and does not
# perfom the detach operation but in cleanup from
# self.attach_volume() it will try to detach the server
# after unrescue the server. Due to that we need to make
# server SSHable before it try to detach, more details are
# in bug#1960346
validation_resources = self.get_class_validation_resources(
self.os_primary)
server = self.create_test_server(
adminPass=self.password,
wait_until="SSHABLE",
validatable=True,
validation_resources=validation_resources)
# Attach the volume to the server
server = self.servers_client.show_server(self.server_id)['server']
self.attach_volume(server, volume)
# Rescue the server
self.servers_client.rescue_server(self.server_id,
self.servers_client.rescue_server(server['id'],
adminPass=self.password)
waiters.wait_for_server_status(self.servers_client,
self.server_id, 'RESCUE')
server['id'], 'RESCUE')
# NOTE(gmann) In next addCleanup, server unrescue is called before the
# detach volume is called in cleanup (added by self.attach_volume()
# method) so to make sure server is ready before detach operation, we
# need to perform ssh on it, more details are in bug#1960346.
if CONF.validation.run_validation:
tenant_network = self.get_tenant_network()
self.addCleanup(compute.wait_for_ssh_or_ping,
server, self.os_primary, tenant_network,
True, validation_resources, "SSHABLE", True)
# addCleanup is a LIFO queue
self.addCleanup(self._unrescue, self.server_id)
self.addCleanup(self._unrescue, server['id'])
# Detach the volume from the server expecting failure
self.assertRaises(lib_exc.Conflict,
self.servers_client.detach_volume,
self.server_id,
server['id'],
volume['id'])