Skip to content

Commit 30aa27b

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "tests: Rename 'compute_sdk_client' -> 'compute_client'"
2 parents dd8e474 + dc68be6 commit 30aa27b

31 files changed

+1040
-1154
lines changed

‎openstackclient/tests/unit/api/test_compute_v2.py‎

Lines changed: 67 additions & 87 deletions
Large diffs are not rendered by default.

‎openstackclient/tests/unit/common/test_availability_zone.py‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ class TestAvailabilityZoneList(
9999
def setUp(self):
100100
super().setUp()
101101

102-
self.compute_sdk_client.availability_zones.return_value = (
103-
self.compute_azs
104-
)
102+
self.compute_client.availability_zones.return_value = self.compute_azs
105103
self.volume_sdk_client.availability_zones.return_value = (
106104
self.volume_azs
107105
)
@@ -120,9 +118,7 @@ def test_availability_zone_list_no_options(self):
120118
# containing the data to be listed.
121119
columns, data = self.cmd.take_action(parsed_args)
122120

123-
self.compute_sdk_client.availability_zones.assert_called_with(
124-
details=True
125-
)
121+
self.compute_client.availability_zones.assert_called_with(details=True)
126122
self.volume_sdk_client.availability_zones.assert_called_with()
127123
self.network_client.availability_zones.assert_called_with()
128124

@@ -150,9 +146,7 @@ def test_availability_zone_list_long(self):
150146
# containing the data to be listed.
151147
columns, data = self.cmd.take_action(parsed_args)
152148

153-
self.compute_sdk_client.availability_zones.assert_called_with(
154-
details=True
155-
)
149+
self.compute_client.availability_zones.assert_called_with(details=True)
156150
self.volume_sdk_client.availability_zones.assert_called_with()
157151
self.network_client.availability_zones.assert_called_with()
158152

@@ -186,9 +180,7 @@ def test_availability_zone_list_compute(self):
186180
# containing the data to be listed.
187181
columns, data = self.cmd.take_action(parsed_args)
188182

189-
self.compute_sdk_client.availability_zones.assert_called_with(
190-
details=True
191-
)
183+
self.compute_client.availability_zones.assert_called_with(details=True)
192184
self.volume_sdk_client.availability_zones.assert_not_called()
193185
self.network_client.availability_zones.assert_not_called()
194186

@@ -212,7 +204,7 @@ def test_availability_zone_list_volume(self):
212204
# containing the data to be listed.
213205
columns, data = self.cmd.take_action(parsed_args)
214206

215-
self.compute_sdk_client.availability_zones.assert_not_called()
207+
self.compute_client.availability_zones.assert_not_called()
216208
self.volume_sdk_client.availability_zones.assert_called_with()
217209
self.network_client.availability_zones.assert_not_called()
218210

@@ -236,7 +228,7 @@ def test_availability_zone_list_network(self):
236228
# containing the data to be listed.
237229
columns, data = self.cmd.take_action(parsed_args)
238230

239-
self.compute_sdk_client.availability_zones.assert_not_called()
231+
self.compute_client.availability_zones.assert_not_called()
240232
self.volume_sdk_client.availability_zones.assert_not_called()
241233
self.network_client.availability_zones.assert_called_with()
242234

‎openstackclient/tests/unit/common/test_extension.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ def setUp(self):
5252
self.identity_client.extensions.list.return_value = [
5353
self.identity_extension
5454
]
55-
self.compute_sdk_client.extensions.return_value = [
56-
self.compute_extension
57-
]
55+
self.compute_client.extensions.return_value = [self.compute_extension]
5856
self.volume_sdk_client.extensions.return_value = [
5957
self.volume_extension
6058
]
@@ -106,7 +104,7 @@ def test_extension_list_no_options(self):
106104
)
107105
self._test_extension_list_helper(arglist, verifylist, datalist)
108106
self.identity_client.extensions.list.assert_called_with()
109-
self.compute_sdk_client.extensions.assert_called_with()
107+
self.compute_client.extensions.assert_called_with()
110108
self.volume_sdk_client.extensions.assert_called_with()
111109
self.network_client.extensions.assert_called_with()
112110

@@ -153,7 +151,7 @@ def test_extension_list_long(self):
153151
)
154152
self._test_extension_list_helper(arglist, verifylist, datalist, True)
155153
self.identity_client.extensions.list.assert_called_with()
156-
self.compute_sdk_client.extensions.assert_called_with()
154+
self.compute_client.extensions.assert_called_with()
157155
self.volume_sdk_client.extensions.assert_called_with()
158156
self.network_client.extensions.assert_called_with()
159157

@@ -230,7 +228,7 @@ def test_extension_list_compute(self):
230228
),
231229
)
232230
self._test_extension_list_helper(arglist, verifylist, datalist)
233-
self.compute_sdk_client.extensions.assert_called_with()
231+
self.compute_client.extensions.assert_called_with()
234232

235233
def test_extension_list_compute_and_network(self):
236234
arglist = [
@@ -254,7 +252,7 @@ def test_extension_list_compute_and_network(self):
254252
),
255253
)
256254
self._test_extension_list_helper(arglist, verifylist, datalist)
257-
self.compute_sdk_client.extensions.assert_called_with()
255+
self.compute_client.extensions.assert_called_with()
258256
self.network_client.extensions.assert_called_with()
259257

260258
def test_extension_list_volume(self):

‎openstackclient/tests/unit/common/test_limits.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def setUp(self):
6868
('DELETE', '*', 100, 100, 'MINUTE', '2011-12-15T22:42:45Z'),
6969
]
7070

71-
self.compute_sdk_client.get_limits.return_value = self.fake_limits
71+
self.compute_client.get_limits.return_value = self.fake_limits
7272

7373
def test_compute_show_absolute(self):
7474
arglist = ['--absolute']

‎openstackclient/tests/unit/common/test_quota.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def setUp(self):
9898
_compute_quota_set.QuotaSet
9999
)
100100
# the defaults are global hence use of return_value here
101-
self.compute_sdk_client.get_quota_set_defaults.return_value = (
101+
self.compute_client.get_quota_set_defaults.return_value = (
102102
self.default_compute_quotas
103103
)
104104
self.compute_reference_data = (
@@ -164,7 +164,7 @@ def setUp(self):
164164

165165
def test_quota_list_compute(self):
166166
# Two projects with non-default quotas
167-
self.compute_sdk_client.get_quota_set.side_effect = self.compute_quotas
167+
self.compute_client.get_quota_set.side_effect = self.compute_quotas
168168

169169
arglist = [
170170
'--compute',
@@ -183,7 +183,7 @@ def test_quota_list_compute(self):
183183

184184
def test_quota_list_compute_default(self):
185185
# One of the projects is at defaults
186-
self.compute_sdk_client.get_quota_set.side_effect = [
186+
self.compute_client.get_quota_set.side_effect = [
187187
self.compute_quotas[0],
188188
self.default_compute_quotas,
189189
]
@@ -205,7 +205,7 @@ def test_quota_list_compute_default(self):
205205

206206
def test_quota_list_compute_project_not_found(self):
207207
# Make one of the projects disappear
208-
self.compute_sdk_client.get_quota_set.side_effect = [
208+
self.compute_client.get_quota_set.side_effect = [
209209
self.compute_quotas[0],
210210
sdk_exceptions.NotFoundException("NotFound"),
211211
]
@@ -227,7 +227,7 @@ def test_quota_list_compute_project_not_found(self):
227227

228228
def test_quota_list_compute_project_inaccessible(self):
229229
# Make one of the projects inaccessible
230-
self.compute_sdk_client.get_quota_set.side_effect = [
230+
self.compute_client.get_quota_set.side_effect = [
231231
self.compute_quotas[0],
232232
sdk_exceptions.ForbiddenException("Forbidden"),
233233
]
@@ -249,7 +249,7 @@ def test_quota_list_compute_project_inaccessible(self):
249249

250250
def test_quota_list_compute_server_error(self):
251251
# Make the server "break"
252-
self.compute_sdk_client.get_quota_set.side_effect = (
252+
self.compute_client.get_quota_set.side_effect = (
253253
sdk_exceptions.HttpException("Not implemented?")
254254
)
255255

@@ -470,7 +470,7 @@ def test_quota_set(self):
470470
'server_group_members': servgroup_members_num,
471471
}
472472

473-
self.compute_sdk_client.update_quota_set.assert_called_once_with(
473+
self.compute_client.update_quota_set.assert_called_once_with(
474474
self.projects[0].id, **kwargs
475475
)
476476
self.assertIsNone(result)
@@ -744,7 +744,7 @@ def test_quota_set_with_class(self):
744744
'volumes': volumes,
745745
}
746746

747-
self.compute_sdk_client.update_quota_class_set.assert_called_with(
747+
self.compute_client.update_quota_class_set.assert_called_with(
748748
self.projects[0].name, **kwargs_compute
749749
)
750750
self.volume_sdk_client.update_quota_class_set.assert_called_with(
@@ -842,7 +842,7 @@ def test_quota_set_default(self):
842842
'volumes': volumes,
843843
}
844844

845-
self.compute_sdk_client.update_quota_class_set.assert_called_with(
845+
self.compute_client.update_quota_class_set.assert_called_with(
846846
'default', **kwargs_compute
847847
)
848848
self.volume_sdk_client.update_quota_class_set.assert_called_with(
@@ -899,7 +899,7 @@ def test_quota_set_with_force(self):
899899
'subnet': subnet,
900900
'force': True,
901901
}
902-
self.compute_sdk_client.update_quota_set.assert_called_once_with(
902+
self.compute_client.update_quota_set.assert_called_once_with(
903903
self.projects[0].id, **kwargs_compute
904904
)
905905
self.volume_sdk_client.update_quota_set.assert_called_once_with(
@@ -942,7 +942,7 @@ def test_quota_set_with_no_force(self):
942942
'subnet': 10,
943943
'check_limit': True,
944944
}
945-
self.compute_sdk_client.update_quota_set.assert_called_once_with(
945+
self.compute_client.update_quota_set.assert_called_once_with(
946946
self.projects[0].id, **kwargs_compute
947947
)
948948
self.volume_sdk_client.update_quota_set.assert_called_once_with(
@@ -977,13 +977,13 @@ def setUp(self):
977977

978978
self.identity_sdk_client.find_project.return_value = self.projects[0]
979979

980-
self.compute_sdk_client.get_quota_set.return_value = (
980+
self.compute_client.get_quota_set.return_value = (
981981
sdk_fakes.generate_fake_resource(_compute_quota_set.QuotaSet)
982982
)
983983
self.default_compute_quotas = sdk_fakes.generate_fake_resource(
984984
_compute_quota_set.QuotaSet
985985
)
986-
self.compute_sdk_client.get_quota_set_defaults.return_value = (
986+
self.compute_client.get_quota_set_defaults.return_value = (
987987
self.default_compute_quotas
988988
)
989989

@@ -1027,7 +1027,7 @@ def test_quota_show(self):
10271027

10281028
self.cmd.take_action(parsed_args)
10291029

1030-
self.compute_sdk_client.get_quota_set.assert_called_once_with(
1030+
self.compute_client.get_quota_set.assert_called_once_with(
10311031
self.projects[0].id,
10321032
usage=False,
10331033
)
@@ -1054,7 +1054,7 @@ def test_quota_show__with_compute(self):
10541054

10551055
self.cmd.take_action(parsed_args)
10561056

1057-
self.compute_sdk_client.get_quota_set.assert_called_once_with(
1057+
self.compute_client.get_quota_set.assert_called_once_with(
10581058
self.projects[0].id,
10591059
usage=False,
10601060
)
@@ -1074,7 +1074,7 @@ def test_quota_show__with_volume(self):
10741074

10751075
self.cmd.take_action(parsed_args)
10761076

1077-
self.compute_sdk_client.get_quota_set.assert_not_called()
1077+
self.compute_client.get_quota_set.assert_not_called()
10781078
self.volume_sdk_client.get_quota_set.assert_called_once_with(
10791079
self.projects[0].id,
10801080
usage=False,
@@ -1094,7 +1094,7 @@ def test_quota_show__with_network(self):
10941094

10951095
self.cmd.take_action(parsed_args)
10961096

1097-
self.compute_sdk_client.get_quota_set.assert_not_called()
1097+
self.compute_client.get_quota_set.assert_not_called()
10981098
self.volume_sdk_client.get_quota_set.assert_not_called()
10991099
self.network_client.get_quota.assert_called_once_with(
11001100
self.projects[0].id,
@@ -1115,7 +1115,7 @@ def test_quota_show__with_default(self):
11151115

11161116
self.cmd.take_action(parsed_args)
11171117

1118-
self.compute_sdk_client.get_quota_set_defaults.assert_called_once_with(
1118+
self.compute_client.get_quota_set_defaults.assert_called_once_with(
11191119
self.projects[0].id,
11201120
)
11211121
self.volume_sdk_client.get_quota_set_defaults.assert_called_once_with(
@@ -1139,7 +1139,7 @@ def test_quota_show__with_usage(self):
11391139

11401140
self.cmd.take_action(parsed_args)
11411141

1142-
self.compute_sdk_client.get_quota_set.assert_called_once_with(
1142+
self.compute_client.get_quota_set.assert_called_once_with(
11431143
self.projects[0].id,
11441144
usage=True,
11451145
)
@@ -1161,7 +1161,7 @@ def test_quota_show__no_project(self):
11611161

11621162
self.cmd.take_action(parsed_args)
11631163

1164-
self.compute_sdk_client.get_quota_set.assert_called_once_with(
1164+
self.compute_client.get_quota_set.assert_called_once_with(
11651165
self.projects[1].id, usage=False
11661166
)
11671167
self.volume_sdk_client.get_quota_set.assert_called_once_with(
@@ -1181,7 +1181,7 @@ def setUp(self):
11811181

11821182
self.identity_sdk_client.find_project.return_value = self.projects[0]
11831183

1184-
self.compute_sdk_client.revert_quota_set.return_value = None
1184+
self.compute_client.revert_quota_set.return_value = None
11851185
self.volume_sdk_client.revert_quota_set.return_value = None
11861186
self.network_client.delete_quota.return_value = None
11871187

@@ -1205,7 +1205,7 @@ def test_delete(self):
12051205
self.identity_sdk_client.find_project.assert_called_once_with(
12061206
self.projects[0].id, ignore_missing=False
12071207
)
1208-
self.compute_sdk_client.revert_quota_set.assert_called_once_with(
1208+
self.compute_client.revert_quota_set.assert_called_once_with(
12091209
self.projects[0].id,
12101210
)
12111211
self.volume_sdk_client.revert_quota_set.assert_called_once_with(
@@ -1234,7 +1234,7 @@ def test_delete__compute(self):
12341234
self.identity_sdk_client.find_project.assert_called_once_with(
12351235
self.projects[0].id, ignore_missing=False
12361236
)
1237-
self.compute_sdk_client.revert_quota_set.assert_called_once_with(
1237+
self.compute_client.revert_quota_set.assert_called_once_with(
12381238
self.projects[0].id,
12391239
)
12401240
self.volume_sdk_client.revert_quota_set.assert_not_called()
@@ -1259,7 +1259,7 @@ def test_delete__volume(self):
12591259
self.identity_sdk_client.find_project.assert_called_once_with(
12601260
self.projects[0].id, ignore_missing=False
12611261
)
1262-
self.compute_sdk_client.revert_quota_set.assert_not_called()
1262+
self.compute_client.revert_quota_set.assert_not_called()
12631263
self.volume_sdk_client.revert_quota_set.assert_called_once_with(
12641264
self.projects[0].id,
12651265
)
@@ -1284,7 +1284,7 @@ def test_delete__network(self):
12841284
self.identity_sdk_client.find_project.assert_called_once_with(
12851285
self.projects[0].id, ignore_missing=False
12861286
)
1287-
self.compute_sdk_client.revert_quota_set.assert_not_called()
1287+
self.compute_client.revert_quota_set.assert_not_called()
12881288
self.volume_sdk_client.revert_quota_set.assert_not_called()
12891289
self.network_client.delete_quota.assert_called_once_with(
12901290
self.projects[0].id,

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,8 @@ class FakeClientMixin:
9898
def setUp(self):
9999
super().setUp()
100100

101-
# TODO(stephenfin): Rename to 'compute_client' once all commands are
102-
# migrated to SDK
103101
self.app.client_manager.compute = mock.Mock(_proxy.Proxy)
104-
self.compute_sdk_client = self.app.client_manager.compute
102+
self.compute_client = self.app.client_manager.compute
105103
self.set_compute_api_version() # default to the lowest
106104

107105
def set_compute_api_version(self, version: str = '2.1'):
@@ -113,8 +111,8 @@ def set_compute_api_version(self, version: str = '2.1'):
113111
"""
114112
assert re.match(r'2.\d+', version)
115113

116-
self.compute_sdk_client.default_microversion = version
117-
self.compute_sdk_client.get_endpoint_data.return_value = (
114+
self.compute_client.default_microversion = version
115+
self.compute_client.get_endpoint_data.return_value = (
118116
discover.EndpointData(
119117
min_microversion='2.1', # nova has not bumped this yet
120118
max_microversion=version,

0 commit comments

Comments
 (0)