Merge "[doc] Fix docs job by adding _static folder to avoid Sphinx warning"
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 57d763e..1d82bc0 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -81,7 +81,6 @@
# The theme to use for HTML and HTML Help pages. Major themes that come with
# Sphinx are currently 'default' and 'sphinxdoc'.
# html_theme_path = ["."]
-html_static_path = ['_static']
html_theme = 'openstackdocs'
# openstackdocstheme options
diff --git a/patrole_tempest_plugin/tests/api/identity/rbac_base.py b/patrole_tempest_plugin/tests/api/identity/rbac_base.py
index e3fac27..6e76a72 100644
--- a/patrole_tempest_plugin/tests/api/identity/rbac_base.py
+++ b/patrole_tempest_plugin/tests/api/identity/rbac_base.py
@@ -28,30 +28,6 @@
base.BaseIdentityTest):
@classmethod
- def setup_test_endpoint(cls, service=None):
- """Creates a service and an endpoint for test."""
- interface = 'public'
- url = data_utils.rand_url()
- region_name = data_utils.rand_name(
- cls.__name__ + '-region')
- # Endpoint creation requires a service
- if service is None:
- service = cls.setup_test_service()
- params = {
- 'service_id': service['id'],
- 'region': region_name,
- 'interface': interface,
- 'url': url
- }
-
- endpoint = cls.endpoints_client.create_endpoint(**params)['endpoint']
- cls.addClassResourceCleanup(
- test_utils.call_and_ignore_notfound_exc,
- cls.endpoints_client.delete_endpoint, endpoint['id'])
-
- return endpoint
-
- @classmethod
def setup_test_role(cls):
"""Set up a test role."""
name = data_utils.rand_name(cls.__name__ + '-test_role')
@@ -182,6 +158,33 @@
super(BaseIdentityV3RbacTest, cls).resource_cleanup()
@classmethod
+ def setup_test_endpoint(cls, service=None):
+ """Creates a service and an endpoint for test."""
+ interface = 'public'
+ url = data_utils.rand_url()
+ region_name = data_utils.rand_name(
+ cls.__name__ + '-region')
+ # Endpoint creation requires a service
+ if service is None:
+ service = cls.setup_test_service()
+ params = {
+ 'service_id': service['id'],
+ 'region': region_name,
+ 'interface': interface,
+ 'url': url
+ }
+
+ endpoint = cls.endpoints_client.create_endpoint(**params)['endpoint']
+ cls.addClassResourceCleanup(
+ test_utils.call_and_ignore_notfound_exc,
+ cls.regions_client.delete_region, endpoint['region'])
+ cls.addClassResourceCleanup(
+ test_utils.call_and_ignore_notfound_exc,
+ cls.endpoints_client.delete_endpoint, endpoint['id'])
+
+ return endpoint
+
+ @classmethod
def setup_test_credential(cls, user=None):
"""Creates a credential for test."""
keys = [data_utils.rand_uuid_hex(),
@@ -249,8 +252,10 @@
"""Creates a region for test."""
description = data_utils.rand_name(
cls.__name__ + '-test_region_desc')
+ id = data_utils.rand_name(cls.__name__)
region = cls.regions_client.create_region(
+ id=id,
description=description)['region']
cls.regions.append(region)