Merge "Disable security group quotas in NetworkSecGroupTest"

This commit is contained in:
Zuul 2020-02-26 18:24:36 +00:00 committed by Gerrit Code Review
commit 15c85f6509
1 changed files with 13 additions and 0 deletions

View File

@ -16,6 +16,7 @@ from neutron_lib import constants
from tempest.common import waiters from tempest.common import waiters
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators from tempest.lib import decorators
from neutron_tempest_plugin.common import ssh from neutron_tempest_plugin.common import ssh
@ -58,6 +59,12 @@ class NetworkSecGroupTest(base.BaseTempestTestCase):
return return
raise e raise e
@classmethod
def setup_credentials(cls):
super(NetworkSecGroupTest, cls).setup_credentials()
cls.project_id = cls.os_primary.credentials.tenant_id
cls.network_client = cls.os_admin.network_client
@classmethod @classmethod
def resource_setup(cls): def resource_setup(cls):
super(NetworkSecGroupTest, cls).resource_setup() super(NetworkSecGroupTest, cls).resource_setup()
@ -68,6 +75,12 @@ class NetworkSecGroupTest(base.BaseTempestTestCase):
cls.create_router_interface(router['id'], cls.subnet['id']) cls.create_router_interface(router['id'], cls.subnet['id'])
cls.keypair = cls.create_keypair() cls.keypair = cls.create_keypair()
def setUp(self):
super(NetworkSecGroupTest, self).setUp()
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.network_client.reset_quotas, self.project_id)
self.network_client.update_quotas(self.project_id, security_group=-1)
def create_vm_testing_sec_grp(self, num_servers=2, security_groups=None, def create_vm_testing_sec_grp(self, num_servers=2, security_groups=None,
ports=None): ports=None):
"""Create instance for security group testing """Create instance for security group testing