openstack/magnum-tempest-plugin
Code Issues Proposed changes

Remove fallback for old tempest

Browse Source 
The [auth] admin_project_name option was introduced in tempest 12.0.0
by [1]. Because the current lower bound of tempest is higher than it,
we can safely assume that the option always exists.

[1] ed6e586b9f8f0ada10af7711f297afa01b2b7754

Change-Id: I90dbeffd18fa073b34ded7ea6e2e2a3bad624cd6
This commit is contained in:
Takashi Kajinami
2025-06-11 00:58:37 +09:00
parent 39569582b2
commit fb142a09f8
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
magnum_tempest_plugin/common/config.py
View File

@@ -11,11 +11,9 @@
# under the License.
import ast
import warnings
from tempest import config
from oslo_config import cfg
CONF = config.CONF
@@ -28,14 +26,7 @@ class Config(object):
def set_admin_creds(cls, config):
cls.admin_user = CONF.auth.admin_username
cls.admin_passwd = CONF.auth.admin_password
# NOTE(toabctl): also allow the old style tempest definition
try:
cls.admin_tenant = CONF.auth.admin_project_name
except cfg.NoSuchOptError:
cls.admin_tenant = CONF.auth.admin_tenant_name
warnings.warn("the config option 'admin_tenant_name' from the "
"'auth' section is deprecated. Please switch "
"to 'admin_project_name'.")
cls.admin_tenant = CONF.auth.admin_project_name
@classmethod
def set_user_creds(cls, config):
@@ -47,14 +38,7 @@ class Config(object):
# check Ia5132c5cb32355d6f26b8acdd92a0e55a2c19f41
cls.user = CONF.auth.admin_username
cls.passwd = CONF.auth.admin_password
# NOTE(toabctl): also allow the old style tempest definition
try:
cls.tenant = CONF.auth.admin_project_name
except cfg.NoSuchOptError:
cls.tenant = CONF.auth.admin_tenant_name
warnings.warn("the config option 'admin_tenant_name' from the "
"'auth' section is deprecated. Please switch "
"to 'admin_project_name'.")
cls.tenant = CONF.auth.admin_project_name
@classmethod
def set_auth_version(cls, config):