Skip to content

Commit 2b670af

Browse files
saikiran9392saikiran9392
committed
Refactor abstract columns and datalist out in compute test cases
columns and datalist has been set in each test case in compute, which is not necessary. This patch abstract it out and remove all redundant code. Change-Id: I5e8423722416ea31fdced4c932ed141de90028ab Closes-Bug: #1531816
1 parent c08545c commit 2b670af

3 files changed

Lines changed: 83 additions & 167 deletions

File tree

‎openstackclient/tests/compute/v2/test_security_group.py‎

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,19 @@ def setUp(self):
5656

5757
class TestSecurityGroupCreate(TestSecurityGroup):
5858

59+
columns = (
60+
'description',
61+
'id',
62+
'name',
63+
'tenant_id',
64+
)
65+
data = (
66+
security_group_description,
67+
security_group_id,
68+
security_group_name,
69+
identity_fakes.project_id,
70+
)
71+
5972
def setUp(self):
6073
super(TestSecurityGroupCreate, self).setUp()
6174

@@ -86,20 +99,8 @@ def test_security_group_create_no_options(self):
8699
security_group_name,
87100
)
88101

89-
collist = (
90-
'description',
91-
'id',
92-
'name',
93-
'tenant_id',
94-
)
95-
self.assertEqual(collist, columns)
96-
datalist = (
97-
security_group_description,
98-
security_group_id,
99-
security_group_name,
100-
identity_fakes.project_id,
101-
)
102-
self.assertEqual(datalist, data)
102+
self.assertEqual(self.columns, columns)
103+
self.assertEqual(self.data, data)
103104

104105
def test_security_group_create_description(self):
105106
arglist = [
@@ -121,20 +122,8 @@ def test_security_group_create_description(self):
121122
security_group_description,
122123
)
123124

124-
collist = (
125-
'description',
126-
'id',
127-
'name',
128-
'tenant_id',
129-
)
130-
self.assertEqual(collist, columns)
131-
datalist = (
132-
security_group_description,
133-
security_group_id,
134-
security_group_name,
135-
identity_fakes.project_id,
136-
)
137-
self.assertEqual(datalist, data)
125+
self.assertEqual(self.columns, columns)
126+
self.assertEqual(self.data, data)
138127

139128

140129
class TestSecurityGroupList(TestSecurityGroup):

‎openstackclient/tests/compute/v2/test_security_group_rule.py‎

Lines changed: 14 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ def setUp(self):
116116

117117
class TestSecurityGroupRuleCreate(TestSecurityGroupRule):
118118

119+
columns = (
120+
'id',
121+
'ip_protocol',
122+
'ip_range',
123+
'parent_group_id',
124+
'port_range',
125+
'remote_security_group',
126+
)
127+
119128
def setUp(self):
120129
super(TestSecurityGroupRuleCreate, self).setUp()
121130

@@ -156,15 +165,7 @@ def test_security_group_rule_create_no_options(self):
156165
None,
157166
)
158167

159-
collist = (
160-
'id',
161-
'ip_protocol',
162-
'ip_range',
163-
'parent_group_id',
164-
'port_range',
165-
'remote_security_group',
166-
)
167-
self.assertEqual(collist, columns)
168+
self.assertEqual(self.columns, columns)
168169
datalist = (
169170
security_group_rule_id,
170171
'tcp',
@@ -208,15 +209,7 @@ def test_security_group_rule_create_ftp(self):
208209
None,
209210
)
210211

211-
collist = (
212-
'id',
213-
'ip_protocol',
214-
'ip_range',
215-
'parent_group_id',
216-
'port_range',
217-
'remote_security_group',
218-
)
219-
self.assertEqual(collist, columns)
212+
self.assertEqual(self.columns, columns)
220213
datalist = (
221214
security_group_rule_id,
222215
'tcp',
@@ -264,15 +257,7 @@ def test_security_group_rule_create_ssh(self):
264257
security_group_id,
265258
)
266259

267-
collist = (
268-
'id',
269-
'ip_protocol',
270-
'ip_range',
271-
'parent_group_id',
272-
'port_range',
273-
'remote_security_group',
274-
)
275-
self.assertEqual(collist, columns)
260+
self.assertEqual(self.columns, columns)
276261
datalist = (
277262
security_group_rule_id,
278263
'tcp',
@@ -315,15 +300,7 @@ def test_security_group_rule_create_udp(self):
315300
None,
316301
)
317302

318-
collist = (
319-
'id',
320-
'ip_protocol',
321-
'ip_range',
322-
'parent_group_id',
323-
'port_range',
324-
'remote_security_group',
325-
)
326-
self.assertEqual(collist, columns)
303+
self.assertEqual(self.columns, columns)
327304
datalist = (
328305
security_group_rule_id,
329306
'udp',
@@ -369,15 +346,7 @@ def test_security_group_rule_create_icmp(self):
369346
None,
370347
)
371348

372-
collist = (
373-
'id',
374-
'ip_protocol',
375-
'ip_range',
376-
'parent_group_id',
377-
'port_range',
378-
'remote_security_group',
379-
)
380-
self.assertEqual(collist, columns)
349+
self.assertEqual(self.columns, columns)
381350
datalist = (
382351
security_group_rule_id,
383352
'icmp',

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

Lines changed: 52 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,26 @@ def run_method_with_servers(self, method_name, server_count):
8989

9090
class TestServerCreate(TestServer):
9191

92+
columns = (
93+
'addresses',
94+
'flavor',
95+
'id',
96+
'name',
97+
'networks',
98+
'properties',
99+
)
100+
101+
def datalist(self):
102+
datalist = (
103+
'',
104+
self.flavor.name + ' ()',
105+
self.new_server.id,
106+
self.new_server.name,
107+
self.new_server.networks,
108+
'',
109+
)
110+
return datalist
111+
92112
def setUp(self):
93113
super(TestServerCreate, self).setUp()
94114

@@ -171,24 +191,8 @@ def test_server_create_minimal(self):
171191
**kwargs
172192
)
173193

174-
collist = (
175-
'addresses',
176-
'flavor',
177-
'id',
178-
'name',
179-
'networks',
180-
'properties',
181-
)
182-
self.assertEqual(collist, columns)
183-
datalist = (
184-
'',
185-
self.flavor.name + ' ()',
186-
self.new_server.id,
187-
self.new_server.name,
188-
self.new_server.networks,
189-
'',
190-
)
191-
self.assertEqual(datalist, data)
194+
self.assertEqual(self.columns, columns)
195+
self.assertEqual(self.datalist(), data)
192196

193197
def test_server_create_with_network(self):
194198
arglist = [
@@ -272,24 +276,8 @@ def test_server_create_with_network(self):
272276
**kwargs
273277
)
274278

275-
collist = (
276-
'addresses',
277-
'flavor',
278-
'id',
279-
'name',
280-
'networks',
281-
'properties',
282-
)
283-
self.assertEqual(collist, columns)
284-
datalist = (
285-
'',
286-
self.flavor.name + ' ()',
287-
self.new_server.id,
288-
self.new_server.name,
289-
self.new_server.networks,
290-
'',
291-
)
292-
self.assertEqual(datalist, data)
279+
self.assertEqual(self.columns, columns)
280+
self.assertEqual(self.datalist(), data)
293281

294282
@mock.patch('openstackclient.compute.v2.server.io.open')
295283
def test_server_create_userdata(self, mock_open):
@@ -345,24 +333,8 @@ def test_server_create_userdata(self, mock_open):
345333
**kwargs
346334
)
347335

348-
collist = (
349-
'addresses',
350-
'flavor',
351-
'id',
352-
'name',
353-
'networks',
354-
'properties',
355-
)
356-
self.assertEqual(collist, columns)
357-
datalist = (
358-
'',
359-
self.flavor.name + ' ()',
360-
self.new_server.id,
361-
self.new_server.name,
362-
self.new_server.networks,
363-
'',
364-
)
365-
self.assertEqual(datalist, data)
336+
self.assertEqual(self.columns, columns)
337+
self.assertEqual(self.datalist(), data)
366338

367339
def test_server_create_with_block_device_mapping(self):
368340
arglist = [
@@ -414,24 +386,8 @@ def test_server_create_with_block_device_mapping(self):
414386
**kwargs
415387
)
416388

417-
collist = (
418-
'addresses',
419-
'flavor',
420-
'id',
421-
'name',
422-
'networks',
423-
'properties',
424-
)
425-
self.assertEqual(collist, columns)
426-
datalist = (
427-
'',
428-
self.flavor.name + ' ()',
429-
self.new_server.id,
430-
self.new_server.name,
431-
self.new_server.networks,
432-
'',
433-
)
434-
self.assertEqual(datalist, data)
389+
self.assertEqual(self.columns, columns)
390+
self.assertEqual(self.datalist(), data)
435391

436392

437393
class TestServerDelete(TestServer):
@@ -536,6 +492,26 @@ def test_server_delete_wait_fails(self, mock_wait_for_delete):
536492

537493
class TestServerImageCreate(TestServer):
538494

495+
columns = (
496+
'id',
497+
'name',
498+
'owner',
499+
'protected',
500+
'tags',
501+
'visibility',
502+
)
503+
504+
def datalist(self):
505+
datalist = (
506+
self.image.id,
507+
self.image.name,
508+
self.image.owner,
509+
self.image.protected,
510+
self.image.tags,
511+
self.image.visibility,
512+
)
513+
return datalist
514+
539515
def setUp(self):
540516
super(TestServerImageCreate, self).setUp()
541517

@@ -569,17 +545,8 @@ def test_server_image_create_no_options(self):
569545
self.server.name,
570546
)
571547

572-
collist = ('id', 'name', 'owner', 'protected', 'tags', 'visibility')
573-
self.assertEqual(collist, columns)
574-
datalist = (
575-
self.image.id,
576-
self.image.name,
577-
self.image.owner,
578-
self.image.protected,
579-
self.image.tags,
580-
self.image.visibility,
581-
)
582-
self.assertEqual(datalist, data)
548+
self.assertEqual(self.columns, columns)
549+
self.assertEqual(self.datalist(), data)
583550

584551
def test_server_image_create_name(self):
585552
arglist = [
@@ -601,17 +568,8 @@ def test_server_image_create_name(self):
601568
'img-nam',
602569
)
603570

604-
collist = ('id', 'name', 'owner', 'protected', 'tags', 'visibility')
605-
self.assertEqual(collist, columns)
606-
datalist = (
607-
self.image.id,
608-
self.image.name,
609-
self.image.owner,
610-
self.image.protected,
611-
self.image.tags,
612-
self.image.visibility,
613-
)
614-
self.assertEqual(datalist, data)
571+
self.assertEqual(self.columns, columns)
572+
self.assertEqual(self.datalist(), data)
615573

616574

617575
class TestServerList(TestServer):

0 commit comments

Comments
 (0)