Merge "fix typos"
This commit is contained in:
commit
01cabf6bbb
@ -79,7 +79,7 @@ def register_conf_options(conf, group):
|
|||||||
def load_from_conf_options(conf, group, **kwargs):
|
def load_from_conf_options(conf, group, **kwargs):
|
||||||
"""Load a plugin from an oslo.config CONF object.
|
"""Load a plugin from an oslo.config CONF object.
|
||||||
|
|
||||||
Each plugin will register there own required options and so there is no
|
Each plugin will register their own required options and so there is no
|
||||||
standard list and the plugin should be consulted.
|
standard list and the plugin should be consulted.
|
||||||
|
|
||||||
The base options should have been registered with register_conf_options
|
The base options should have been registered with register_conf_options
|
||||||
|
@ -154,7 +154,7 @@ class V3Discovery(DiscoveryBase):
|
|||||||
|
|
||||||
Provides some default values and helper methods for creating a v3
|
Provides some default values and helper methods for creating a v3
|
||||||
endpoint version structure. Clients should use this instead of creating
|
endpoint version structure. Clients should use this instead of creating
|
||||||
there own structures.
|
their own structures.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@utils.positional()
|
@utils.positional()
|
||||||
|
@ -319,14 +319,14 @@ class ScopeFederationTokenTests(AuthenticateviaSAML2Tests):
|
|||||||
self.PROJECT_SCOPED_TOKEN_JSON = client_fixtures.project_scoped_token()
|
self.PROJECT_SCOPED_TOKEN_JSON = client_fixtures.project_scoped_token()
|
||||||
self.PROJECT_SCOPED_TOKEN_JSON['methods'] = ['saml2']
|
self.PROJECT_SCOPED_TOKEN_JSON['methods'] = ['saml2']
|
||||||
|
|
||||||
# for better readibility
|
# for better readability
|
||||||
self.TEST_TENANT_ID = self.PROJECT_SCOPED_TOKEN_JSON.project_id
|
self.TEST_TENANT_ID = self.PROJECT_SCOPED_TOKEN_JSON.project_id
|
||||||
self.TEST_TENANT_NAME = self.PROJECT_SCOPED_TOKEN_JSON.project_name
|
self.TEST_TENANT_NAME = self.PROJECT_SCOPED_TOKEN_JSON.project_name
|
||||||
|
|
||||||
self.DOMAIN_SCOPED_TOKEN_JSON = client_fixtures.domain_scoped_token()
|
self.DOMAIN_SCOPED_TOKEN_JSON = client_fixtures.domain_scoped_token()
|
||||||
self.DOMAIN_SCOPED_TOKEN_JSON['methods'] = ['saml2']
|
self.DOMAIN_SCOPED_TOKEN_JSON['methods'] = ['saml2']
|
||||||
|
|
||||||
# for better readibility
|
# for better readability
|
||||||
self.TEST_DOMAIN_ID = self.DOMAIN_SCOPED_TOKEN_JSON.domain_id
|
self.TEST_DOMAIN_ID = self.DOMAIN_SCOPED_TOKEN_JSON.domain_id
|
||||||
self.TEST_DOMAIN_NAME = self.DOMAIN_SCOPED_TOKEN_JSON.domain_name
|
self.TEST_DOMAIN_NAME = self.DOMAIN_SCOPED_TOKEN_JSON.domain_name
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user