DNM/WIP: Detect misconfig and navigate

Change-Id: I483b1250835bd73fe41d7b7acf5f7a382ba6b6e8
This commit is contained in:
Julia Kreger 2024-01-23 15:13:44 -08:00
parent 227a519fc9
commit 1ffe266284
1 changed files with 24 additions and 4 deletions

View File

@ -40,6 +40,9 @@ SUPPORTED_DRIVERS = ['fake', 'fake-hardware']
RESOURCE_TYPES = ['port', 'portgroup', 'node', 'volume_connector',
'volume_target', 'chassis', 'deploy_template']
# Flag to allow us to discover a misconfiguration state and handle it.
USE_SCOPED_RBAC = None
def creates(resource):
"""Decorator that adds resources to the appropriate cleanup list."""
@ -62,6 +65,7 @@ class BaseBaremetalTest(api_version_utils.BaseMicroversionTest,
"""Base class for Baremetal API tests."""
credentials = ['admin', 'system_admin']
use_system_scope = None
@classmethod
def skip_checks(cls):
@ -81,6 +85,12 @@ class BaseBaremetalTest(api_version_utils.BaseMicroversionTest,
cfg_min_version,
cfg_max_version)
@classmethod
def change_to_system_client(cls):
cls.client = cls.os_system_admin.baremetal.BaremetalClient()
global USE_SCOPED_RBAC
USE_SCOPED_RBAC = True
@classmethod
def setup_credentials(cls):
cls.request_microversion = (
@ -95,7 +105,8 @@ class BaseBaremetalTest(api_version_utils.BaseMicroversionTest,
@classmethod
def setup_clients(cls):
super(BaseBaremetalTest, cls).setup_clients()
if CONF.enforce_scope.ironic:
# if CONF.enforce_scope.ironic:
if USE_SCOPED_RBAC:
cls.client = cls.os_system_admin.baremetal.BaremetalClient()
else:
cls.client = cls.os_admin.baremetal.BaremetalClient()
@ -192,9 +203,18 @@ class BaseBaremetalTest(api_version_utils.BaseMicroversionTest,
:return: A tuple with the server response and the created chassis.
"""
description = description or data_utils.rand_name('test-chassis')
resp, body = cls.client.create_chassis(description=description,
**kwargs)
try:
description = description or data_utils.rand_name('test-chassis')
resp, body = cls.client.create_chassis(description=description,
**kwargs)
except lib_exc.ServerFault as e:
if 'request was made with project scope' in e:
# Server is enforcing Secure RBAC and tempest was misconfigured
cls.change_to_system_client()
resp, body = cls.client.create_chassis(
description=description, **kwargs)
else:
raise
return resp, body
@classmethod