openstack/tempest
Code Issues Proposed changes

Fix test_stamp_pattern to remove dependency of user supplied volume name

Browse Source 
This patch removes CONF.compute.volume_device_name dependency and
use modified list_disks method to get the newly attached
device name and use that for mkfs rather than the user supplied
device name which is based on assumtion.

Also modfied test_attach_detach testcase and unit test
for remote_client accordingly.

Change-Id: I862d1ba55f45b09385057a51b0b52a851c19287e
Closes-Bug: #1852807
This commit is contained in:
Paras Babbar
2019-12-11 16:51:57 -05:00
parent d3c82c7922
commit 4b45f9e54c
5 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tempest/api/compute/volumes/test_attach_volume.py
View File

@@ -79,7 +79,7 @@ class AttachVolumeTestJSON(BaseAttachVolumeTest):
# NOTE(andreaf) We need to ensure the ssh key has been # NOTE(andreaf) We need to ensure the ssh key has been
# injected in the guest before we power cycle # injected in the guest before we power cycle
linux_client.validate_authentication() linux_client.validate_authentication()
disks_before_attach = linux_client.count_disks() disks_before_attach = linux_client.list_disks()
volume = self.create_volume() volume = self.create_volume()
@@ -101,8 +101,10 @@ class AttachVolumeTestJSON(BaseAttachVolumeTest):
'ACTIVE') 'ACTIVE')
if CONF.validation.run_validation: if CONF.validation.run_validation:
disks_after_attach = linux_client.count_disks() disks_after_attach = linux_client.list_disks()
self.assertGreater(disks_after_attach, disks_before_attach) self.assertGreater(
len(disks_after_attach),
len(disks_before_attach))
self.servers_client.detach_volume(server['id'], attachment['volumeId']) self.servers_client.detach_volume(server['id'], attachment['volumeId'])
waiters.wait_for_volume_resource_status( waiters.wait_for_volume_resource_status(
@@ -117,8 +119,8 @@ class AttachVolumeTestJSON(BaseAttachVolumeTest):
'ACTIVE') 'ACTIVE')
if CONF.validation.run_validation: if CONF.validation.run_validation:
disks_after_detach = linux_client.count_disks() disks_after_detach = linux_client.list_disks()
self.assertEqual(disks_before_attach, disks_after_detach) self.assertEqual(len(disks_before_attach), len(disks_after_detach))
@decorators.idempotent_id('7fa563fe-f0f7-43eb-9e22-a1ece036b513') @decorators.idempotent_id('7fa563fe-f0f7-43eb-9e22-a1ece036b513')
def test_list_get_volume_attachments(self): def test_list_get_volume_attachments(self):

4
tempest/common/utils/linux/remote_client.py
View File

@@ -73,12 +73,12 @@ class RemoteClient(remote_client.RemoteClient):
msg = "'TYPE' column is required but the output doesn't have it: " msg = "'TYPE' column is required but the output doesn't have it: "
raise tempest.lib.exceptions.TempestException(msg + output) raise tempest.lib.exceptions.TempestException(msg + output)
def count_disks(self): def list_disks(self):
disks_list = self.get_disks() disks_list = self.get_disks()
disks_list = [line[0] for line in disks_list = [line[0] for line in
[device_name.split() [device_name.split()
for device_name in disks_list.splitlines()][1:]] for device_name in disks_list.splitlines()][1:]]
return len(disks_list) return disks_list
def get_boot_time(self): def get_boot_time(self):
cmd = 'cut -f1 -d. /proc/uptime' cmd = 'cut -f1 -d. /proc/uptime'

3
tempest/scenario/manager.py
View File

@@ -634,8 +634,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
def nova_volume_attach(self, server, volume_to_attach): def nova_volume_attach(self, server, volume_to_attach):
volume = self.servers_client.attach_volume( volume = self.servers_client.attach_volume(
server['id'], volumeId=volume_to_attach['id'], device='/dev/%s' server['id'], volumeId=volume_to_attach['id'])['volumeAttachment']
% CONF.compute.volume_device_name)['volumeAttachment']
self.assertEqual(volume_to_attach['id'], volume['id']) self.assertEqual(volume_to_attach['id'], volume['id'])
waiters.wait_for_volume_resource_status(self.volumes_client, waiters.wait_for_volume_resource_status(self.volumes_client,
volume['id'], 'in-use') volume['id'], 'in-use')

42
tempest/scenario/test_stamp_pattern.py
View File

@@ -55,20 +55,24 @@ class TestStampPattern(manager.ScenarioTest):
if not CONF.volume_feature_enabled.snapshot: if not CONF.volume_feature_enabled.snapshot:
raise cls.skipException("Cinder volume snapshots are disabled") raise cls.skipException("Cinder volume snapshots are disabled")
def _wait_for_volume_available_on_the_system(self, ip_address, def _attached_volume_name(
private_key): self, disks_list_before_attach, ip_address, private_key):
ssh = self.get_remote_client(ip_address, private_key=private_key) ssh = self.get_remote_client(ip_address, private_key=private_key)
def _func(): def _wait_for_volume_available_on_system():
disks = ssh.get_disks() disks_list_after_attach = ssh.list_disks()
LOG.debug("Disks: %s", disks) return len(disks_list_after_attach) > len(disks_list_before_attach)
return CONF.compute.volume_device_name in disks
if not test_utils.call_until_true(_func, if not test_utils.call_until_true(_wait_for_volume_available_on_system,
CONF.compute.build_timeout, CONF.compute.build_timeout,
CONF.compute.build_interval): CONF.compute.build_interval):
raise lib_exc.TimeoutException raise lib_exc.TimeoutException
disks_list_after_attach = ssh.list_disks()
volume_name = [item for item in disks_list_after_attach
if item not in disks_list_before_attach][0]
return volume_name
@decorators.attr(type='slow') @decorators.attr(type='slow')
@decorators.idempotent_id('10fd234a-515c-41e5-b092-8323060598c5') @decorators.idempotent_id('10fd234a-515c-41e5-b092-8323060598c5')
@testtools.skipUnless(CONF.compute_feature_enabled.snapshot, @testtools.skipUnless(CONF.compute_feature_enabled.snapshot,
@@ -91,15 +95,16 @@ class TestStampPattern(manager.ScenarioTest):
ip_for_server = self.get_server_ip(server) ip_for_server = self.get_server_ip(server)
# Make sure the machine ssh-able before attaching the volume # Make sure the machine ssh-able before attaching the volume
self.get_remote_client(ip_for_server, linux_client = self.get_remote_client(
private_key=keypair['private_key'], ip_for_server, private_key=keypair['private_key'],
server=server) server=server)
disks_list_before_attach = linux_client.list_disks()
self.nova_volume_attach(server, volume) self.nova_volume_attach(server, volume)
self._wait_for_volume_available_on_the_system(ip_for_server, volume_device_name = self._attached_volume_name(
keypair['private_key']) disks_list_before_attach, ip_for_server, keypair['private_key'])
timestamp = self.create_timestamp(ip_for_server, timestamp = self.create_timestamp(ip_for_server,
CONF.compute.volume_device_name, volume_device_name,
private_key=keypair['private_key'], private_key=keypair['private_key'],
server=server) server=server)
self.nova_volume_detach(server, volume) self.nova_volume_detach(server, volume)
@@ -126,18 +131,19 @@ class TestStampPattern(manager.ScenarioTest):
# Make sure the machine ssh-able before attaching the volume # Make sure the machine ssh-able before attaching the volume
# Just a live machine is responding # Just a live machine is responding
# for device attache/detach as expected # for device attache/detach as expected
self.get_remote_client(ip_for_snapshot, linux_client = self.get_remote_client(
private_key=keypair['private_key'], ip_for_snapshot, private_key=keypair['private_key'],
server=server_from_snapshot) server=server_from_snapshot)
disks_list_before_attach = linux_client.list_disks()
# attach volume2 to instance2 # attach volume2 to instance2
self.nova_volume_attach(server_from_snapshot, volume_from_snapshot) self.nova_volume_attach(server_from_snapshot, volume_from_snapshot)
self._wait_for_volume_available_on_the_system(ip_for_snapshot, volume_device_name = self._attached_volume_name(
keypair['private_key']) disks_list_before_attach, ip_for_snapshot, keypair['private_key'])
# check the existence of the timestamp file in the volume2 # check the existence of the timestamp file in the volume2
timestamp2 = self.get_timestamp(ip_for_snapshot, timestamp2 = self.get_timestamp(ip_for_snapshot,
CONF.compute.volume_device_name, volume_device_name,
private_key=keypair['private_key'], private_key=keypair['private_key'],
server=server_from_snapshot) server=server_from_snapshot)
self.assertEqual(timestamp, timestamp2) self.assertEqual(timestamp, timestamp2)

5
tempest/tests/common/utils/linux/test_remote_client.py
View File

@@ -106,14 +106,15 @@ sdb 8:16 0 1000204886016 0 disk"""
self.assertEqual(self.conn.get_disks(), result) self.assertEqual(self.conn.get_disks(), result)
self._assert_exec_called_with('lsblk -lb --nodeps') self._assert_exec_called_with('lsblk -lb --nodeps')
def test_count_disk(self): def test_list_disks(self):
output_lsblk = """\ output_lsblk = """\
NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT
sda 8:0 0 128035676160 0 disk sda 8:0 0 128035676160 0 disk
sdb 8:16 0 1000204886016 0 disk sdb 8:16 0 1000204886016 0 disk
sr0 11:0 1 1073741312 0 rom""" sr0 11:0 1 1073741312 0 rom"""
disk_list = ['sda', 'sdb']
self.ssh_mock.mock.exec_command.return_value = output_lsblk self.ssh_mock.mock.exec_command.return_value = output_lsblk
self.assertEqual(self.conn.count_disks(), 2) self.assertEqual(self.conn.list_disks(), disk_list)
def test_get_boot_time(self): def test_get_boot_time(self):
booted_at = 10000 booted_at = 10000