openstack/barbican-tempest-plugin
Code Issues Proposed changes

Merge "Support files removed for CONF.scenario.img_dir option"

Browse Source
This commit is contained in:
Zuul 2024-03-08 19:41:19 +00:00 committed by Gerrit Code Review
commit 82b0e48639
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
barbican_tempest_plugin/tests/scenario/barbican_manager.py
View File

@ -30,6 +30,7 @@ from cryptography.x509.oid import NameOID
from oslo_log import log as logging from oslo_log import log as logging
from tempest.api.compute import api_microversion_fixture from tempest.api.compute import api_microversion_fixture
from tempest import config from tempest import config
from tempest.lib import exceptions as lib_exc
from barbican_tempest_plugin.tests.scenario import manager as mgr from barbican_tempest_plugin.tests.scenario import manager as mgr
@ -55,18 +56,13 @@ class BarbicanScenarioTest(mgr.ScenarioTest):
self.request_microversion)) self.request_microversion))
self.img_file = CONF.scenario.img_file self.img_file = CONF.scenario.img_file
if not os.path.exists(self.img_file): if not os.path.exists(self.img_file):
# TODO(kopecmartin): replace LOG.warning for rasing lib_exc.InvalidConfiguration(
# InvalidConfiguration exception after tempest 25.0.0 is
# released - there will be one release which accepts both
# behaviors in order to avoid many failures across CIs and etc.
LOG.warning(
'Starting Tempest 25.0.0 release, CONF.scenario.img_file need ' 'Starting Tempest 25.0.0 release, CONF.scenario.img_file need '
'a full path for the image. CONF.scenario.img_dir was ' 'a full path for the image. CONF.scenario.img_dir was '
'deprecated and will be removed in the next release. Till ' 'deprecated and will be removed in the next release. Till '
'Tempest 25.0.0, old behavior is maintained and keep working ' 'Tempest 25.0.0, old behavior was maintained and kept working '
'but starting Tempest 26.0.0, you need to specify the full ' 'but starting Tempest 26.0.0, you need to specify the full '
'path in CONF.scenario.img_file config option.') 'path in CONF.scenario.img_file config option.')
self.img_file = os.path.join(CONF.scenario.img_dir, self.img_file)
self.private_key = rsa.generate_private_key(public_exponent=65537, self.private_key = rsa.generate_private_key(public_exponent=65537,
key_size=3072, key_size=3072,