x/ranger-tempest-plugin
Code Issues Proposed changes

Fix bad client initialization

Browse Source 
Testing of region groups had badly
named client. This resolves client
to be rms_client for region group
testing

Change-Id: If7bc501b450cdbfa47dcf90c5a97c9507ec5188d
This commit is contained in:
jh629g 2020-04-02 11:08:52 -05:00
parent 38de76fe6b
commit ab1437b2fa
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,25 +28,27 @@ class TestTempestRegionGroup(base.BaseOrmTest):
def resource_setup(cls): def resource_setup(cls):
cls.setup_ids = [] cls.setup_ids = []
cls.group_ids = [] cls.group_ids = []
cls.rms_client = cls.os_admin.rms_client
# create standard region # create standard region
_, cls.region_1 = cls.client.create_region(data_utils.rand_name()) _, cls.region_1 = cls.rms_client.create_region(data_utils.rand_name())
cls.setup_ids.append(cls.region_1['id']) cls.setup_ids.append(cls.region_1['id'])
# create region sharing region_1 properties # create region sharing region_1 properties
_, cls.region_2 = cls.client.create_region(data_utils.rand_name()) _, cls.region_2 = cls.rms_client.create_region(data_utils.rand_name())
cls.setup_ids.append(cls.region_2['id']) cls.setup_ids.append(cls.region_2['id'])
_, cls.group_1 = cls.client.create_region_group( _, cls.group_1 = cls.rms_client.create_region_group(
**orm_data_utils.rand_region_group(cls.setup_ids)) **orm_data_utils.rand_region_group(cls.setup_ids))
cls.group_ids.append(cls.group_1['group']['id']) cls.group_ids.append(cls.group_1['group']['id'])
_, cls.group_2 = cls.client.create_region_group( _, cls.group_2 = cls.rms_client.create_region_group(
**orm_data_utils.rand_region_group(cls.setup_ids)) **orm_data_utils.rand_region_group(cls.setup_ids))
cls.group_ids.append(cls.group_2['group']['id']) cls.group_ids.append(cls.group_2['group']['id'])
for region_id in cls.setup_ids: for region_id in cls.setup_ids:
cls.addClassResourceCleanup(cls.client.delete_region, region_id) cls.addClassResourceCleanup(cls.rms_client.delete_region,
region_id)
for group_id in cls.group_ids: for group_id in cls.group_ids:
cls.addClassResourceCleanup(cls.client.delete_region_group, cls.addClassResourceCleanup(cls.rms_client.delete_region_group,
group_id) group_id)
super(TestTempestRegionGroup, cls).resource_setup() super(TestTempestRegionGroup, cls).resource_setup()
@ -55,12 +57,12 @@ class TestTempestRegionGroup(base.BaseOrmTest):
def test_update_group(self): def test_update_group(self):
_id = self.group_ids[-1] _id = self.group_ids[-1]
group = orm_data_utils.rand_region_group(self.setup_ids, _id) group = orm_data_utils.rand_region_group(self.setup_ids, _id)
_, body = self.client.update_region_group(_id, **group) _, body = self.rms_client.update_region_group(_id, **group)
self.assert_expected(group, body['group'], ['regions']) self.assert_expected(group, body['group'], ['regions'])
@decorators.idempotent_id('b946c6c4-d601-42b9-befd-ba40992a3c53') @decorators.idempotent_id('b946c6c4-d601-42b9-befd-ba40992a3c53')
def test_list_groups(self): def test_list_groups(self):
_, body = self.client.list_region_groups() _, body = self.rms_client.list_region_groups()
groups = [x['id'] for x in body['groups']] groups = [x['id'] for x in body['groups']]
self.assertIn(self.group_1['group']['id'], groups) self.assertIn(self.group_1['group']['id'], groups)
self.assertIn(self.group_2['group']['id'], groups) self.assertIn(self.group_2['group']['id'], groups)
@ -68,15 +70,15 @@ class TestTempestRegionGroup(base.BaseOrmTest):
@decorators.idempotent_id('9a37d966-4416-4ff3-8f3b-6847810662d7') @decorators.idempotent_id('9a37d966-4416-4ff3-8f3b-6847810662d7')
def test_get_group(self): def test_get_group(self):
_id = self.group_1['group']['id'] _id = self.group_1['group']['id']
_, body = self.client.get_region_group(_id) _, body = self.rms_client.get_region_group(_id)
self.assert_expected(self.group_1['group'], body, ['links']) self.assert_expected(self.group_1['group'], body, ['links'])
@decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9529') @decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9529')
def test_create_region_group(self): def test_create_region_group(self):
_, region_group = self.client.create_region_group( _, region_group = self.rms_client.create_region_group(
**orm_data_utils.rand_region_group(self.setup_ids) **orm_data_utils.rand_region_group(self.setup_ids)
) )
_, region_group_details = self.client.get_region_group( _, region_group_details = self.rms_client.get_region_group(
region_group['group']['id'] region_group['group']['id']
) )
self.assertIn( self.assertIn(
@ -89,15 +91,15 @@ class TestTempestRegionGroup(base.BaseOrmTest):
) )
self.addCleanup( self.addCleanup(
self.client.delete_region_group, self.rms_client.delete_region_group,
region_group['group']['id']) region_group['group']['id'])
@decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9530') @decorators.idempotent_id('504cc5cb-bc19-48ea-9456-16f5b24c9530')
def test_delete_region_group(self): def test_delete_region_group(self):
_, region_group = self.client.create_region_group( _, region_group = self.rms_client.create_region_group(
**orm_data_utils.rand_region_group(self.setup_ids) **orm_data_utils.rand_region_group(self.setup_ids)
) )
_, region_group_details = self.client.get_region_group( _, region_group_details = self.rms_client.get_region_group(
region_group['group']['id'] region_group['group']['id']
) )
@ -110,9 +112,9 @@ class TestTempestRegionGroup(base.BaseOrmTest):
region_group_details['regions'] region_group_details['regions']
) )
self.client.delete_region_group(region_group['group']['id']) self.rms_client.delete_region_group(region_group['group']['id'])
self.assertRaises( self.assertRaises(
exceptions.NotFound, self.client.get_region_group, exceptions.NotFound, self.rms_client.get_region_group,
region_group['group']['id'] region_group['group']['id']
) )
@ -123,6 +125,6 @@ class TestTempestRegionGroup(base.BaseOrmTest):
ids = ['some_non_existenant_region'] ids = ['some_non_existenant_region']
self.assertRaises( self.assertRaises(
exceptions.BadRequest, self.client.create_region_group, exceptions.BadRequest, self.rms_client.create_region_group,
**orm_data_utils.rand_region_group(ids) **orm_data_utils.rand_region_group(ids)
) )