Add api_v2_admin flag

Only run Identity V2 admin tests if the identity v2 admin API is
available. The new config flag is set to True by default.

Change-Id: I43459cb1a96e725dde41e23962e367dbdc345686
This commit is contained in:
Andrea Frittoli 2017-04-21 14:33:23 +01:00
parent 9e01dbbe40
commit 1413ba9c06
3 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,7 @@
---
features:
- |
A new configuration flag api_v2_admin is introduced in the identity
feature flag group to allow for enabling/disabling all identity v2
admin tests. The new flag only applies when the existing api_v2 flag
is set to True

View File

@ -126,6 +126,12 @@ class BaseIdentityV2AdminTest(BaseIdentityV2Test):
# executed, so this will not impact the ability to execute tests. # executed, so this will not impact the ability to execute tests.
force_tenant_isolation = True force_tenant_isolation = True
@classmethod
def skip_checks(cls):
super(BaseIdentityV2AdminTest, cls).skip_checks()
if not CONF.identity_feature_enabled.api_v2_admin:
raise cls.skipException('Identity v2 admin not available')
@classmethod @classmethod
def setup_clients(cls): def setup_clients(cls):
super(BaseIdentityV2AdminTest, cls).setup_clients() super(BaseIdentityV2AdminTest, cls).setup_clients()

View File

@ -208,6 +208,10 @@ IdentityFeatureGroup = [
cfg.BoolOpt('api_v2', cfg.BoolOpt('api_v2',
default=True, default=True,
help='Is the v2 identity API enabled'), help='Is the v2 identity API enabled'),
cfg.BoolOpt('api_v2_admin',
default=True,
help="Is the v2 identity admin API available? This setting "
"only applies if api_v2 is set to True."),
cfg.BoolOpt('api_v3', cfg.BoolOpt('api_v3',
default=True, default=True,
help='Is the v3 identity API enabled'), help='Is the v3 identity API enabled'),