Skip to content

Commit 63a6789

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Use FakeProject and FakeDomain classes in unit tests of networkv2"
2 parents 56a232c + 6825263 commit 63a6789

7 files changed

Lines changed: 77 additions & 121 deletions

File tree

‎openstackclient/tests/network/v2/test_address_scope.py‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# under the License.
1212
#
1313

14-
import copy
1514
import mock
1615

1716
from mock import call
@@ -35,11 +34,13 @@ def setUp(self):
3534

3635
class TestCreateAddressScope(TestAddressScope):
3736

37+
project = identity_fakes_v3.FakeProject.create_one_project()
38+
domain = identity_fakes_v3.FakeDomain.create_one_domain()
3839
# The new address scope created.
3940
new_address_scope = (
4041
network_fakes.FakeAddressScope.create_one_address_scope(
4142
attrs={
42-
'tenant_id': identity_fakes_v3.project_id,
43+
'tenant_id': project.id,
4344
}
4445
))
4546
columns = (
@@ -75,19 +76,11 @@ def setUp(self):
7576

7677
# Get a shortcut to the ProjectManager Mock
7778
self.projects_mock = self.identity.projects
78-
self.projects_mock.get.return_value = fakes.FakeResource(
79-
None,
80-
copy.deepcopy(identity_fakes_v3.PROJECT),
81-
loaded=True,
82-
)
79+
self.projects_mock.get.return_value = self.project
8380

8481
# Get a shortcut to the DomainManager Mock
8582
self.domains_mock = self.identity.domains
86-
self.domains_mock.get.return_value = fakes.FakeResource(
87-
None,
88-
copy.deepcopy(identity_fakes_v3.DOMAIN),
89-
loaded=True,
90-
)
83+
self.domains_mock.get.return_value = self.domain
9184

9285
def test_create_no_options(self):
9386
arglist = []
@@ -121,15 +114,15 @@ def test_create_all_options(self):
121114
arglist = [
122115
'--ip-version', str(self.new_address_scope.ip_version),
123116
'--share',
124-
'--project', identity_fakes_v3.project_name,
125-
'--project-domain', identity_fakes_v3.domain_name,
117+
'--project', self.project.name,
118+
'--project-domain', self.domain.name,
126119
self.new_address_scope.name,
127120
]
128121
verifylist = [
129122
('ip_version', self.new_address_scope.ip_version),
130123
('share', True),
131-
('project', identity_fakes_v3.project_name),
132-
('project_domain', identity_fakes_v3.domain_name),
124+
('project', self.project.name),
125+
('project_domain', self.domain.name),
133126
('name', self.new_address_scope.name),
134127
]
135128

@@ -139,7 +132,7 @@ def test_create_all_options(self):
139132
self.network.create_address_scope.assert_called_once_with(**{
140133
'ip_version': self.new_address_scope.ip_version,
141134
'shared': True,
142-
'tenant_id': identity_fakes_v3.project_id,
135+
'tenant_id': self.project.id,
143136
'name': self.new_address_scope.name,
144137
})
145138
self.assertEqual(self.columns, columns)

‎openstackclient/tests/network/v2/test_ip_availability.py‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# under the License.
1212
#
1313

14-
import copy
1514
import mock
1615

1716
from osc_lib import utils as common_utils
@@ -41,11 +40,8 @@ def setUp(self):
4140

4241
# Get a shortcut to the ProjectManager Mock
4342
self.projects_mock = self.identity.projects
44-
self.projects_mock.get.return_value = fakes.FakeResource(
45-
None,
46-
copy.deepcopy(identity_fakes.PROJECT),
47-
loaded=True,
48-
)
43+
self.project = identity_fakes.FakeProject.create_one_project()
44+
self.projects_mock.get.return_value = self.project
4945

5046

5147
class TestListIPAvailability(TestIPAvailability):
@@ -109,16 +105,16 @@ def test_list_ip_version(self):
109105

110106
def test_list_project(self):
111107
arglist = [
112-
'--project', identity_fakes.project_name
108+
'--project', self.project.name
113109
]
114110
verifylist = [
115-
('project', identity_fakes.project_name)
111+
('project', self.project.name)
116112
]
117113

118114
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
119115

120116
columns, data = self.cmd.take_action(parsed_args)
121-
filters = {'tenant_id': identity_fakes.project_id,
117+
filters = {'tenant_id': self.project.id,
122118
'ip_version': 4}
123119

124120
self.network.network_ip_availabilities.assert_called_once_with(

‎openstackclient/tests/network/v2/test_network.py‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# under the License.
1212
#
1313

14-
import copy
1514
import mock
1615
from mock import call
1716

@@ -40,10 +39,12 @@ def setUp(self):
4039

4140
class TestCreateNetworkIdentityV3(TestNetwork):
4241

42+
project = identity_fakes_v3.FakeProject.create_one_project()
43+
domain = identity_fakes_v3.FakeDomain.create_one_domain()
4344
# The new network created.
4445
_network = network_fakes.FakeNetwork.create_one_network(
4546
attrs={
46-
'tenant_id': identity_fakes_v3.project_id,
47+
'tenant_id': project.id,
4748
'availability_zone_hints': ["nova"],
4849
}
4950
)
@@ -96,19 +97,11 @@ def setUp(self):
9697

9798
# Get a shortcut to the ProjectManager Mock
9899
self.projects_mock = self.identity.projects
99-
self.projects_mock.get.return_value = fakes.FakeResource(
100-
None,
101-
copy.deepcopy(identity_fakes_v3.PROJECT),
102-
loaded=True,
103-
)
100+
self.projects_mock.get.return_value = self.project
104101

105102
# Get a shortcut to the DomainManager Mock
106103
self.domains_mock = self.identity.domains
107-
self.domains_mock.get.return_value = fakes.FakeResource(
108-
None,
109-
copy.deepcopy(identity_fakes_v3.DOMAIN),
110-
loaded=True,
111-
)
104+
self.domains_mock.get.return_value = self.domain
112105

113106
def test_create_no_options(self):
114107
arglist = []
@@ -143,8 +136,8 @@ def test_create_all_options(self):
143136
arglist = [
144137
"--disable",
145138
"--share",
146-
"--project", identity_fakes_v3.project_name,
147-
"--project-domain", identity_fakes_v3.domain_name,
139+
"--project", self.project.name,
140+
"--project-domain", self.domain.name,
148141
"--availability-zone-hint", "nova",
149142
"--external", "--default",
150143
"--provider-network-type", "vlan",
@@ -156,8 +149,8 @@ def test_create_all_options(self):
156149
verifylist = [
157150
('disable', True),
158151
('share', True),
159-
('project', identity_fakes_v3.project_name),
160-
('project_domain', identity_fakes_v3.domain_name),
152+
('project', self.project.name),
153+
('project_domain', self.domain.name),
161154
('availability_zone_hints', ["nova"]),
162155
('external', True),
163156
('default', True),
@@ -176,7 +169,7 @@ def test_create_all_options(self):
176169
'availability_zone_hints': ["nova"],
177170
'name': self._network.name,
178171
'shared': True,
179-
'tenant_id': identity_fakes_v3.project_id,
172+
'tenant_id': self.project.id,
180173
'is_default': True,
181174
'router:external': True,
182175
'provider:network_type': 'vlan',
@@ -214,9 +207,10 @@ def test_create_other_options(self):
214207

215208
class TestCreateNetworkIdentityV2(TestNetwork):
216209

210+
project = identity_fakes_v2.FakeProject.create_one_project()
217211
# The new network created.
218212
_network = network_fakes.FakeNetwork.create_one_network(
219-
attrs={'tenant_id': identity_fakes_v2.project_id}
213+
attrs={'tenant_id': project.id}
220214
)
221215

222216
columns = (
@@ -267,24 +261,20 @@ def setUp(self):
267261

268262
# Get a shortcut to the ProjectManager Mock
269263
self.projects_mock = self.identity.tenants
270-
self.projects_mock.get.return_value = fakes.FakeResource(
271-
None,
272-
copy.deepcopy(identity_fakes_v2.PROJECT),
273-
loaded=True,
274-
)
264+
self.projects_mock.get.return_value = self.project
275265

276266
# There is no DomainManager Mock in fake identity v2.
277267

278268
def test_create_with_project_identityv2(self):
279269
arglist = [
280-
"--project", identity_fakes_v2.project_name,
270+
"--project", self.project.name,
281271
self._network.name,
282272
]
283273
verifylist = [
284274
('enable', True),
285275
('share', None),
286276
('name', self._network.name),
287-
('project', identity_fakes_v2.project_name),
277+
('project', self.project.name),
288278
('external', False),
289279
]
290280

@@ -294,22 +284,22 @@ def test_create_with_project_identityv2(self):
294284
self.network.create_network.assert_called_once_with(**{
295285
'admin_state_up': True,
296286
'name': self._network.name,
297-
'tenant_id': identity_fakes_v2.project_id,
287+
'tenant_id': self.project.id,
298288
})
299289
self.assertEqual(self.columns, columns)
300290
self.assertEqual(self.data, data)
301291

302292
def test_create_with_domain_identityv2(self):
303293
arglist = [
304-
"--project", identity_fakes_v3.project_name,
305-
"--project-domain", identity_fakes_v3.domain_name,
294+
"--project", self.project.name,
295+
"--project-domain", "domain-name",
306296
self._network.name,
307297
]
308298
verifylist = [
309299
('enable', True),
310300
('share', None),
311-
('project', identity_fakes_v3.project_name),
312-
('project_domain', identity_fakes_v3.domain_name),
301+
('project', self.project.name),
302+
('project_domain', "domain-name"),
313303
('name', self._network.name),
314304
('external', False),
315305
]

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

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# under the License.
1212
#
1313

14-
import copy
1514
import mock
1615
from mock import call
1716

@@ -45,6 +44,8 @@ def setUp(self):
4544

4645
class TestCreateSecurityGroupNetwork(TestSecurityGroupNetwork):
4746

47+
project = identity_fakes.FakeProject.create_one_project()
48+
domain = identity_fakes.FakeDomain.create_one_domain()
4849
# The security group to be created.
4950
_security_group = \
5051
network_fakes.FakeSecurityGroup.create_one_security_group()
@@ -81,19 +82,11 @@ def setUp(self):
8182

8283
# Get a shortcut to the ProjectManager Mock
8384
self.projects_mock = self.identity.projects
84-
self.projects_mock.get.return_value = fakes.FakeResource(
85-
None,
86-
copy.deepcopy(identity_fakes.PROJECT),
87-
loaded=True,
88-
)
85+
self.projects_mock.get.return_value = self.project
8986

9087
# Get a shortcut to the DomainManager Mock
9188
self.domains_mock = self.identity.domains
92-
self.domains_mock.get.return_value = fakes.FakeResource(
93-
None,
94-
copy.deepcopy(identity_fakes.DOMAIN),
95-
loaded=True,
96-
)
89+
self.domains_mock.get.return_value = self.domain
9790

9891
# Get the command object to test
9992
self.cmd = security_group.CreateSecurityGroup(self.app, self.namespace)
@@ -123,15 +116,15 @@ def test_create_min_options(self):
123116
def test_create_all_options(self):
124117
arglist = [
125118
'--description', self._security_group.description,
126-
'--project', identity_fakes.project_name,
127-
'--project-domain', identity_fakes.domain_name,
119+
'--project', self.project.name,
120+
'--project-domain', self.domain.name,
128121
self._security_group.name,
129122
]
130123
verifylist = [
131124
('description', self._security_group.description),
132125
('name', self._security_group.name),
133-
('project', identity_fakes.project_name),
134-
('project_domain', identity_fakes.domain_name),
126+
('project', self.project.name),
127+
('project_domain', self.domain.name),
135128
]
136129
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
137130

@@ -140,14 +133,16 @@ def test_create_all_options(self):
140133
self.network.create_security_group.assert_called_once_with(**{
141134
'description': self._security_group.description,
142135
'name': self._security_group.name,
143-
'tenant_id': identity_fakes.project_id,
136+
'tenant_id': self.project.id,
144137
})
145138
self.assertEqual(self.columns, columns)
146139
self.assertEqual(self.data, data)
147140

148141

149142
class TestCreateSecurityGroupCompute(TestSecurityGroupCompute):
150143

144+
project = identity_fakes.FakeProject.create_one_project()
145+
domain = identity_fakes.FakeDomain.create_one_domain()
151146
# The security group to be shown.
152147
_security_group = \
153148
compute_fakes.FakeSecurityGroup.create_one_security_group()
@@ -184,8 +179,8 @@ def test_create_no_options(self):
184179

185180
def test_create_network_options(self):
186181
arglist = [
187-
'--project', identity_fakes.project_name,
188-
'--project-domain', identity_fakes.domain_name,
182+
'--project', self.project.name,
183+
'--project-domain', self.domain.name,
189184
self._security_group.name,
190185
]
191186
self.assertRaises(tests_utils.ParserException,

0 commit comments

Comments
 (0)