Merge "make Patrole to run for shared network env"

This commit is contained in:
Zuul 2019-04-28 23:08:03 +00:00 committed by Gerrit Code Review
commit 4e081dfd68
9 changed files with 68 additions and 1 deletions

View File

@ -41,6 +41,11 @@ class ServerActionsRbacTest(rbac_base.BaseV2ComputeRbacTest):
super(ServerActionsRbacTest, cls).setup_clients()
cls.admin_servers_client = cls.os_admin.servers_client
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerActionsRbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerActionsRbacTest, cls).resource_setup()
@ -357,6 +362,11 @@ class ServerActionsV214RbacTest(rbac_base.BaseV2ComputeRbacTest):
min_microversion = '2.14'
max_microversion = 'latest'
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerActionsV214RbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerActionsV214RbacTest, cls).resource_setup()
@ -389,6 +399,11 @@ class ServerActionsV216RbacTest(rbac_base.BaseV2ComputeRbacTest):
min_microversion = '2.16'
max_microversion = 'latest'
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerActionsV216RbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerActionsV216RbacTest, cls).resource_setup()

View File

@ -30,6 +30,11 @@ class ServerConsolesRbacTest(rbac_base.BaseV2ComputeRbacTest):
if not CONF.compute_feature_enabled.console_output:
raise cls.skipException('Console output not available.')
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerConsolesRbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerConsolesRbacTest, cls).resource_setup()
@ -54,6 +59,11 @@ class ServerConsolesMaxV25RbacTest(rbac_base.BaseV2ComputeRbacTest):
if not CONF.compute_feature_enabled.console_output:
raise cls.skipException('Console output not available.')
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerConsolesMaxV25RbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerConsolesMaxV25RbacTest, cls).resource_setup()
@ -79,6 +89,11 @@ class ServerConsolesV26RbacTest(rbac_base.BaseV2ComputeRbacTest):
if not CONF.compute_feature_enabled.console_output:
raise cls.skipException('Console output not available.')
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerConsolesV26RbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerConsolesV26RbacTest, cls).resource_setup()

View File

@ -21,6 +21,11 @@ from patrole_tempest_plugin.tests.api.compute import rbac_base
class ServerMetadataRbacTest(rbac_base.BaseV2ComputeRbacTest):
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerMetadataRbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerMetadataRbacTest, cls).resource_setup()

View File

@ -50,6 +50,11 @@ class MiscPolicyActionsRbacTest(rbac_base.BaseV2ComputeRbacTest):
credentials = ['primary', 'admin']
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(MiscPolicyActionsRbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(MiscPolicyActionsRbacTest, cls).resource_setup()

View File

@ -32,6 +32,11 @@ LOG = log.getLogger(__name__)
class ComputeServersRbacTest(base.BaseV2ComputeRbacTest):
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ComputeServersRbacTest, cls).setup_credentials()
@classmethod
def setup_clients(cls):
super(ComputeServersRbacTest, cls).setup_clients()

View File

@ -33,6 +33,11 @@ class ServerTagsRbacTest(rbac_base.BaseV2ComputeRbacTest):
msg = "os-server-tags extension is not enabled."
raise cls.skipException(msg)
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerTagsRbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(ServerTagsRbacTest, cls).resource_setup()

View File

@ -36,6 +36,11 @@ LOG = logging.getLogger(__name__)
# revisited at a later date.
class ServerVolumeAttachmentRbacTest(rbac_base.BaseV2ComputeRbacTest):
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(ServerVolumeAttachmentRbacTest, cls).setup_credentials()
@classmethod
def setup_clients(cls):
super(ServerVolumeAttachmentRbacTest, cls).setup_clients()

View File

@ -256,6 +256,7 @@ class NetworksRbacTest(base.BaseNetworkRbacTest):
with self.override_role():
self._update_network(net_id=network['id'], router_external=True)
@decorators.skip_because(bug='2005489', bug_type='storyboard')
@utils.requires_ext(extension='provider', service='network')
@rbac_rule_validation.action(
service="neutron",
@ -281,6 +282,7 @@ class NetworksRbacTest(base.BaseNetworkRbacTest):
"Plugin does not support updating provider attributes",
str(exc))
@decorators.skip_because(bug='2005489', bug_type='storyboard')
@utils.requires_ext(extension='provider', service='network')
@rbac_rule_validation.action(
service="neutron",
@ -306,6 +308,7 @@ class NetworksRbacTest(base.BaseNetworkRbacTest):
"Plugin does not support updating provider attributes",
str(exc))
@decorators.skip_because(bug='2005489', bug_type='storyboard')
@utils.requires_ext(extension='provider', service='network')
@rbac_rule_validation.action(
service="neutron",

View File

@ -36,14 +36,23 @@ class VolumesActionsV3RbacTest(rbac_base.BaseVolumeRbacTest):
super(VolumesActionsV3RbacTest, cls).setup_clients()
cls.image_client = cls.os_primary.image_client_v2
@classmethod
def setup_credentials(cls):
cls.set_network_resources(network=True, subnet=True, router=True)
super(VolumesActionsV3RbacTest, cls).setup_credentials()
@classmethod
def resource_setup(cls):
super(VolumesActionsV3RbacTest, cls).resource_setup()
cls.volume = cls.create_volume()
def _create_server(self):
tenant_network = self.get_tenant_network()
server, _ = compute.create_test_server(
self.os_primary, wait_until='ACTIVE')
self.os_primary, tenant_network=tenant_network,
wait_until='ACTIVE')
self.addCleanup(waiters.wait_for_server_termination,
self.servers_client, server['id'])
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.servers_client.delete_server, server['id'])
return server