x/ranger-tempest-plugin
Code Issues Proposed changes

Removed duplicate class objects during setup

Browse Source 
This patch removed inheritance of region group test class from
region test class to avoid duplicate creation of test objects.

Change-Id: Ia21e21fa8940fc9d7521889fbf3d924fc1847e3a
This commit is contained in:
Chi Lo 2020-08-18 14:46:56 -07:00
parent 3db2d2c746
commit 4d2e23a4b0
2 changed files with 141 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ranger_tempest_plugin/tests/api/rms_base.py
View File

@ -53,9 +53,9 @@ class RmsBaseOrmTest(base.BaseOrmTest):
@classmethod
def setup_clients(cls):
super(RmsBaseOrmTest, cls).setup_clients()
cls.client = cls.os_primary.rms_client
cls.cms_client = cls.os_primary.cms_client
super(RmsBaseOrmTest, cls).setup_clients()
@classmethod
def _get_region_params(cls):
@ -110,9 +110,9 @@ class RmsBaseOrmTest(base.BaseOrmTest):
@classmethod
def _get_customer_params(cls):
customer = {}
customer['description'] = data_utils.rand_name('ormTempestCms')
customer['description'] = data_utils.rand_name('ormTempestRms')
customer['enabled'] = True
customer['name'] = data_utils.rand_name('ormTempestCms')
customer['name'] = data_utils.rand_name('ormTempestRms')
customer['regions'] = [{'name': CONF.identity.region}]
customer['defaultQuotas'] = []
customer['users'] = []

44
ranger_tempest_plugin/tests/api/test_region_groups.py
View File

@ -14,35 +14,57 @@
# under the License.
from ranger_tempest_plugin import data_utils as orm_data_utils
from ranger_tempest_plugin.tests.api import rms_base
from ranger_tempest_plugin.tests.api import base
from ranger_tempest_plugin.tests.api.rms_base import RmsBaseOrmTest
from tempest.lib import decorators
from tempest.lib import exceptions
class TestTempestRegionGroup(rms_base.RmsBaseOrmTest):
class TestTempestRegionGroup(base.BaseOrmTest):
@classmethod
def resource_setup(cls):
super(TestTempestRegionGroup, cls).resource_setup()
cls.region_ids = []
# create standard region
_, cls.region_1 = cls.client.create_region(
**RmsBaseOrmTest._get_region_params())
cls.region_ids.append(cls.region_1['id'])
# create region sharing region_1 properties
another_region = RmsBaseOrmTest._get_region_params()
another_region['metadata'] = {'key2': ['value2']}
_, cls.region_2 = cls.client.create_region(**another_region)
cls.region_ids.append(cls.region_2['id'])
for region_id in cls.region_ids:
cls.addClassResourceCleanup(cls.client.delete_region, region_id)
# set up region groups
cls.group_ids = []
_, cls.group_1 = cls.client.create_region_group(
**orm_data_utils.rand_region_group(cls.setup_ids))
**orm_data_utils.rand_region_group(cls.region_ids))
cls.group_ids.append(cls.group_1['group']['id'])
_, cls.group_2 = cls.client.create_region_group(
**orm_data_utils.rand_region_group(cls.setup_ids))
**orm_data_utils.rand_region_group(cls.region_ids))
cls.group_ids.append(cls.group_2['group']['id'])
for group_id in cls.group_ids:
cls.addClassResourceCleanup(cls.client.delete_region_group,
group_id)
@classmethod
def setup_clients(cls):
super(TestTempestRegionGroup, cls).setup_clients()
cls.client = cls.os_primary.rms_client
@decorators.idempotent_id('0d377eb2-754d-49c1-9a4f-c7019dfe80ca')
def test_update_group(self):
_id = self.group_ids[-1]
group = orm_data_utils.rand_region_group(self.setup_ids, _id)
group = orm_data_utils.rand_region_group(self.region_ids, _id)
_, body = self.client.update_region_group(_id, **group)
self.assert_expected(group, body['group'], ['regions'])
@ -62,17 +84,17 @@ class TestTempestRegionGroup(rms_base.RmsBaseOrmTest):
@decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9529')
def test_create_region_group(self):
_, region_group = self.client.create_region_group(
**orm_data_utils.rand_region_group(self.setup_ids)
**orm_data_utils.rand_region_group(self.region_ids)
)
_, region_group_details = self.client.get_region_group(
region_group['group']['id']
)
self.assertIn(
self.setup_ids[0],
self.region_ids[0],
region_group_details['regions']
)
self.assertIn(
self.setup_ids[1],
self.region_ids[1],
region_group_details['regions']
)
@ -83,18 +105,18 @@ class TestTempestRegionGroup(rms_base.RmsBaseOrmTest):
@decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9530')
def test_delete_region_group(self):
_, region_group = self.client.create_region_group(
**orm_data_utils.rand_region_group(self.setup_ids)
**orm_data_utils.rand_region_group(self.region_ids)
)
_, region_group_details = self.client.get_region_group(
region_group['group']['id']
)
self.assertIn(
self.setup_ids[0],
self.region_ids[0],
region_group_details['regions']
)
self.assertIn(
self.setup_ids[1],
self.region_ids[1],
region_group_details['regions']
)