openstack
/
heat-tempest-plugin
Code Issues Proposed changes

Rectify volumes tests 

* pass updated stack parameters directly to keep the original value
* volume property of display_description ain't available
  in cinder api version 2+

Change-Id: I346b4da7d002e86f39280ef6caf141a18b0404e3
Story: 2007217
Task: 38468
This commit is contained in:
Michael Polenchuk 2019-12-18 15:11:10 +04:00 committed by Pavlo Shchelokovskyy
parent 0ee85bb046
commit 0643b17c11
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat_tempest_plugin/tests/scenario/scenario_base.py
View File

@ -51,11 +51,6 @@ class ScenarioTestsBase(test.HeatIntegrationTest):
template = self._load_template(__file__, template_name, self.sub_dir,
files)
parameters = parameters or {}
if kwargs.get('add_parameters'):
parameters.update(kwargs['add_parameters'])
stack_id = self.stack_create(
stack_name=kwargs.get('stack_name'),
template=template,

23
heat_tempest_plugin/tests/scenario/test_volumes.py
View File

@ -12,6 +12,7 @@
from cinderclient import exceptions as cinder_exceptions
import copy
from oslo_log import log as logging
import six
from tempest.lib import decorators
@ -38,8 +39,7 @@ class VolumeBackupRestoreIntegrationTest(scenario_base.ScenarioTestsBase):
self.assertIsNotNone(volume)
self.assertEqual(expected_status, volume.status)
self.assertEqual(self.volume_size, volume.size)
self.assertEqual(self.volume_description,
volume.display_description)
self.assertEqual(self.volume_description, volume.description)
def _outputs_verify(self, stack, expected_status='available'):
self.assertEqual(expected_status,
@ -49,7 +49,7 @@ class VolumeBackupRestoreIntegrationTest(scenario_base.ScenarioTestsBase):
self.assertEqual(self.volume_description,
self._stack_output(stack, 'display_description'))
def check_stack(self, stack_id, parameters):
def check_stack(self, stack_id, default_parameters):
stack = self.client.stacks.get(stack_id)
# Verify with cinder that the volume exists, with matching details
@ -73,13 +73,14 @@ class VolumeBackupRestoreIntegrationTest(scenario_base.ScenarioTestsBase):
backup = backups_filtered[0]
self.addCleanup(self.volume_client.backups.delete, backup.id)
parameters = copy.deepcopy(default_parameters)
parameters.update({'backup_id': backup.id})
# Now, we create another stack where the volume is created from the
# backup created by the previous stack
try:
stack_identifier2 = self.launch_stack(
template_name='test_volumes_create_from_backup.yaml',
parameters=parameters,
add_parameters={'backup_id': backup.id})
parameters=parameters)
stack2 = self.client.stacks.get(stack_identifier2)
except exceptions.StackBuildErrorException:
LOG.exception("Halting test due to bug: #1382300")
@ -113,7 +114,7 @@ class VolumeBackupRestoreIntegrationTest(scenario_base.ScenarioTestsBase):
4. Create a new stack, where the volume is created from the backup
5. Verify the test data written in (1) is present in the new volume
"""
parameters = {
default_parameters = {
'key_name': self.keypair_name,
'instance_type': self.conf.minimal_instance_type,
'image_id': self.conf.minimal_image_ref,
@ -122,13 +123,15 @@ class VolumeBackupRestoreIntegrationTest(scenario_base.ScenarioTestsBase):
'network': self.net['id']
}
if self.conf.vm_to_heat_api_insecure:
parameters['wc_extra_args'] = '--insecure'
default_parameters['wc_extra_args'] = '--insecure'
parameters = copy.deepcopy(default_parameters)
parameters.update({'volume_size': self.volume_size})
# Launch stack
stack_id = self.launch_stack(
template_name='test_volumes_delete_snapshot.yaml',
parameters=parameters,
add_parameters={'volume_size': self.volume_size}
parameters=parameters
)
# Check stack
self.check_stack(stack_id, parameters)
self.check_stack(stack_id, default_parameters)