Skip to content

Commit 4cef5f5

Browse files
gtemastephenfin
gtema
authored and
stephenfin
committed
Adopt sdk_fakes for compute.test_server_group
Change-Id: I1c97a7b2e28233a3b345a81b62c01e74a0aec914
1 parent 38029c6 commit 4cef5f5

File tree

3 files changed

+104
-133
lines changed

3 files changed

+104
-133
lines changed

‎openstackclient/tests/unit/compute/v2/fakes.py‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from openstack.compute.v2 import migration as _migration
2929
from openstack.compute.v2 import server as _server
3030
from openstack.compute.v2 import server_action as _server_action
31-
from openstack.compute.v2 import server_group as _server_group
3231
from openstack.compute.v2 import server_interface as _server_interface
3332
from openstack.compute.v2 import server_migration as _server_migration
3433
from openstack.compute.v2 import volume_attachment as _volume_attachment
@@ -1019,32 +1018,6 @@ def create_volume_attachments(attrs=None, count=2):
10191018
return volume_attachments
10201019

10211020

1022-
def create_one_server_group(attrs=None):
1023-
"""Create a fake server group
1024-
1025-
:param dict attrs: A dictionary with all attributes
1026-
:return: A fake openstack.compute.v2.server_group.ServerGroup object
1027-
"""
1028-
if attrs is None:
1029-
attrs = {}
1030-
1031-
# Set default attributes.
1032-
server_group_info = {
1033-
'id': 'server-group-id-' + uuid.uuid4().hex,
1034-
'member_ids': '',
1035-
'metadata': {},
1036-
'name': 'server-group-name-' + uuid.uuid4().hex,
1037-
'project_id': 'server-group-project-id-' + uuid.uuid4().hex,
1038-
'user_id': 'server-group-user-id-' + uuid.uuid4().hex,
1039-
}
1040-
1041-
# Overwrite default attributes.
1042-
server_group_info.update(attrs)
1043-
1044-
server_group = _server_group.ServerGroup(**server_group_info)
1045-
return server_group
1046-
1047-
10481021
def create_one_server_interface(attrs=None):
10491022
"""Create a fake SDK ServerInterface.
10501023

‎openstackclient/tests/unit/compute/v2/test_server.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
import uuid
2222

2323
import iso8601
24+
from openstack.compute.v2 import server_group as _server_group
2425
from openstack import exceptions as sdk_exceptions
26+
from openstack.test import fakes as sdk_fakes
2527
from osc_lib.cli import format_columns
2628
from osc_lib import exceptions
2729
from osc_lib import utils as common_utils
@@ -1375,7 +1377,9 @@ def test_server_create_minimal(self):
13751377
self.assertEqual(self.datalist(), data)
13761378

13771379
def test_server_create_with_options(self):
1378-
server_group = compute_fakes.create_one_server_group()
1380+
server_group = sdk_fakes.generate_fake_resource(
1381+
_server_group.ServerGroup
1382+
)
13791383
self.compute_sdk_client.find_server_group.return_value = server_group
13801384

13811385
security_group = network_fakes.create_one_security_group()

‎openstackclient/tests/unit/compute/v2/test_server_group.py‎

Lines changed: 99 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# under the License.
1414
#
1515

16+
from openstack.compute.v2 import server_group as _server_group
17+
from openstack.test import fakes as sdk_fakes
1618
from osc_lib.cli import format_columns
1719
from osc_lib import exceptions
1820

@@ -22,27 +24,31 @@
2224

2325

2426
class TestServerGroup(compute_fakes.TestComputev2):
25-
fake_server_group = compute_fakes.create_one_server_group()
26-
27-
columns = (
28-
'id',
29-
'members',
30-
'name',
31-
'policy',
32-
'project_id',
33-
'rules',
34-
'user_id',
35-
)
36-
37-
data = (
38-
fake_server_group.id,
39-
format_columns.ListColumn(fake_server_group.member_ids),
40-
fake_server_group.name,
41-
fake_server_group.policy,
42-
fake_server_group.project_id,
43-
format_columns.DictColumn(fake_server_group.rules),
44-
fake_server_group.user_id,
45-
)
27+
def setUp(self):
28+
super().setUp()
29+
30+
self.fake_server_group = sdk_fakes.generate_fake_resource(
31+
_server_group.ServerGroup
32+
)
33+
34+
self.columns = (
35+
'id',
36+
'members',
37+
'name',
38+
'policy',
39+
'project_id',
40+
'rules',
41+
'user_id',
42+
)
43+
self.data = (
44+
self.fake_server_group.id,
45+
format_columns.ListColumn(self.fake_server_group.member_ids),
46+
self.fake_server_group.name,
47+
self.fake_server_group.policy,
48+
self.fake_server_group.project_id,
49+
format_columns.DictColumn(self.fake_server_group.rules),
50+
self.fake_server_group.user_id,
51+
)
4652

4753

4854
class TestServerGroupCreate(TestServerGroup):
@@ -262,82 +268,6 @@ def test_server_group_multiple_delete_with_exception(self):
262268

263269

264270
class TestServerGroupList(TestServerGroup):
265-
list_columns = (
266-
'ID',
267-
'Name',
268-
'Policies',
269-
)
270-
271-
list_columns_long = (
272-
'ID',
273-
'Name',
274-
'Policies',
275-
'Members',
276-
'Project Id',
277-
'User Id',
278-
)
279-
280-
list_columns_v264 = (
281-
'ID',
282-
'Name',
283-
'Policy',
284-
)
285-
286-
list_columns_v264_long = (
287-
'ID',
288-
'Name',
289-
'Policy',
290-
'Members',
291-
'Project Id',
292-
'User Id',
293-
)
294-
295-
list_data = (
296-
(
297-
TestServerGroup.fake_server_group.id,
298-
TestServerGroup.fake_server_group.name,
299-
format_columns.ListColumn(
300-
TestServerGroup.fake_server_group.policies
301-
),
302-
),
303-
)
304-
305-
list_data_long = (
306-
(
307-
TestServerGroup.fake_server_group.id,
308-
TestServerGroup.fake_server_group.name,
309-
format_columns.ListColumn(
310-
TestServerGroup.fake_server_group.policies
311-
),
312-
format_columns.ListColumn(
313-
TestServerGroup.fake_server_group.member_ids
314-
),
315-
TestServerGroup.fake_server_group.project_id,
316-
TestServerGroup.fake_server_group.user_id,
317-
),
318-
)
319-
320-
list_data_v264 = (
321-
(
322-
TestServerGroup.fake_server_group.id,
323-
TestServerGroup.fake_server_group.name,
324-
TestServerGroup.fake_server_group.policy,
325-
),
326-
)
327-
328-
list_data_v264_long = (
329-
(
330-
TestServerGroup.fake_server_group.id,
331-
TestServerGroup.fake_server_group.name,
332-
TestServerGroup.fake_server_group.policy,
333-
format_columns.ListColumn(
334-
TestServerGroup.fake_server_group.member_ids
335-
),
336-
TestServerGroup.fake_server_group.project_id,
337-
TestServerGroup.fake_server_group.user_id,
338-
),
339-
)
340-
341271
def setUp(self):
342272
super().setUp()
343273

@@ -359,8 +289,21 @@ def test_server_group_list(self):
359289

360290
self.compute_sdk_client.server_groups.assert_called_once_with()
361291

362-
self.assertCountEqual(self.list_columns, columns)
363-
self.assertCountEqual(self.list_data, tuple(data))
292+
expected_columns = (
293+
'ID',
294+
'Name',
295+
'Policies',
296+
)
297+
expected_data = (
298+
(
299+
self.fake_server_group.id,
300+
self.fake_server_group.name,
301+
format_columns.ListColumn(self.fake_server_group.policies),
302+
),
303+
)
304+
305+
self.assertCountEqual(expected_columns, columns)
306+
self.assertCountEqual(expected_data, tuple(data))
364307

365308
def test_server_group_list_with_all_projects_and_long(self):
366309
arglist = [
@@ -379,8 +322,27 @@ def test_server_group_list_with_all_projects_and_long(self):
379322
all_projects=True
380323
)
381324

382-
self.assertCountEqual(self.list_columns_long, columns)
383-
self.assertCountEqual(self.list_data_long, tuple(data))
325+
expected_columns = (
326+
'ID',
327+
'Name',
328+
'Policies',
329+
'Members',
330+
'Project Id',
331+
'User Id',
332+
)
333+
expected_data = (
334+
(
335+
self.fake_server_group.id,
336+
self.fake_server_group.name,
337+
format_columns.ListColumn(self.fake_server_group.policies),
338+
format_columns.ListColumn(self.fake_server_group.member_ids),
339+
self.fake_server_group.project_id,
340+
self.fake_server_group.user_id,
341+
),
342+
)
343+
344+
self.assertCountEqual(expected_columns, columns)
345+
self.assertCountEqual(expected_data, tuple(data))
384346

385347
def test_server_group_list_with_limit(self):
386348
arglist = [
@@ -428,8 +390,21 @@ def test_server_group_list_v264(self):
428390
columns, data = self.cmd.take_action(parsed_args)
429391
self.compute_sdk_client.server_groups.assert_called_once_with()
430392

431-
self.assertCountEqual(self.list_columns_v264, columns)
432-
self.assertCountEqual(self.list_data_v264, tuple(data))
393+
expected_columns = (
394+
'ID',
395+
'Name',
396+
'Policy',
397+
)
398+
expected_data = (
399+
(
400+
self.fake_server_group.id,
401+
self.fake_server_group.name,
402+
self.fake_server_group.policy,
403+
),
404+
)
405+
406+
self.assertCountEqual(expected_columns, columns)
407+
self.assertCountEqual(expected_data, tuple(data))
433408

434409
def test_server_group_list_with_all_projects_and_long_v264(self):
435410
self.set_compute_api_version('2.64')
@@ -448,8 +423,27 @@ def test_server_group_list_with_all_projects_and_long_v264(self):
448423
all_projects=True
449424
)
450425

451-
self.assertCountEqual(self.list_columns_v264_long, columns)
452-
self.assertCountEqual(self.list_data_v264_long, tuple(data))
426+
expected_columns = (
427+
'ID',
428+
'Name',
429+
'Policy',
430+
'Members',
431+
'Project Id',
432+
'User Id',
433+
)
434+
expected_data = (
435+
(
436+
self.fake_server_group.id,
437+
self.fake_server_group.name,
438+
self.fake_server_group.policy,
439+
format_columns.ListColumn(self.fake_server_group.member_ids),
440+
self.fake_server_group.project_id,
441+
self.fake_server_group.user_id,
442+
),
443+
)
444+
445+
self.assertCountEqual(expected_columns, columns)
446+
self.assertCountEqual(expected_data, tuple(data))
453447

454448

455449
class TestServerGroupShow(TestServerGroup):

0 commit comments

Comments
 (0)