openstack/blazar-tempest-plugin
Code Issues Proposed changes

Remove deprecated scenario image options

Browse Source 
The following options have been deprecated for more than 4 years
already and currently are being removed from tempest:
* aki_img_file
* ari_img_file
* ami_img_file

Change-Id: I50559a47520c15b7ed09f10427ecae9a6ce123e1
Related-Bug: #1393881
This commit is contained in:
Martin Kopec 2020-03-12 11:46:38 +00:00
parent cd629d46dd
commit 053132173f
1 changed files with 8 additions and 21 deletions

29
blazar_tempest_plugin/tests/scenario/manager_freeze.py

@ -386,31 +386,18 @@ class ScenarioTest(tempest.test.BaseTestCase):
return image['id']
def glance_image_create(self):
img_path = CONF.scenario.img_dir + "/" + CONF.scenario.img_file
aki_img_path = CONF.scenario.img_dir + "/" + CONF.scenario.aki_img_file
ari_img_path = CONF.scenario.img_dir + "/" + CONF.scenario.ari_img_file
ami_img_path = CONF.scenario.img_dir + "/" + CONF.scenario.ami_img_file
img_path = CONF.scenario.img_file
img_container_format = CONF.scenario.img_container_format
img_disk_format = CONF.scenario.img_disk_format
img_properties = CONF.scenario.img_properties
LOG.debug("paths: img: %s, container_format: %s, disk_format: %s, "
"properties: %s, ami: %s, ari: %s, aki: %s",
img_path, img_container_format, img_disk_format,
img_properties, ami_img_path, ari_img_path, aki_img_path)
try:
image = self._image_create('scenario-img',
img_container_format,
img_path,
disk_format=img_disk_format,
properties=img_properties)
except IOError:
LOG.debug("A qcow2 image was not found. Try to get a uec image.")
kernel = self._image_create('scenario-aki', 'aki', aki_img_path)
ramdisk = self._image_create('scenario-ari', 'ari', ari_img_path)
properties = {'kernel_id': kernel, 'ramdisk_id': ramdisk}
image = self._image_create('scenario-ami', 'ami',
path=ami_img_path,
properties=properties)
"properties: %s", img_path, img_container_format,
img_disk_format, img_properties)
image = self._image_create('scenario-img',
img_container_format,
img_path,
disk_format=img_disk_format,
properties=img_properties)
LOG.debug("image:%s", image)
return image