Skip to content

Commit e3bd9a4

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "volume: Migrate 'block storage log level *' to SDK"
2 parents d5238d1 + 00f4cf9 commit e3bd9a4

File tree

2 files changed

+83
-99
lines changed

2 files changed

+83
-99
lines changed

‎openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py‎

Lines changed: 61 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,45 @@
1010
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1111
# License for the specific language governing permissions and limitations
1212
# under the License.
13-
#
1413

1514
import ddt
15+
from openstack.block_storage.v3 import service as _service
16+
from openstack.test import fakes as sdk_fakes
1617
from osc_lib import exceptions
1718

1819
from openstackclient.tests.unit import utils as tests_utils
1920
from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
2021
from openstackclient.volume.v3 import block_storage_log_level as service
2122

2223

23-
class TestService(volume_fakes.TestVolume):
24-
def setUp(self):
25-
super().setUp()
26-
27-
# Get a shortcut to the ServiceManager Mock
28-
self.service_mock = self.volume_client.services
29-
self.service_mock.reset_mock()
30-
31-
32-
class TestBlockStorageLogLevelList(TestService):
33-
service_log = volume_fakes.create_service_log_level_entry()
34-
24+
class TestBlockStorageLogLevelList(volume_fakes.TestVolume):
3525
def setUp(self):
3626
super().setUp()
3727

38-
self.service_mock.get_log_levels.return_value = [self.service_log]
28+
self.log_level = sdk_fakes.generate_fake_resource(
29+
_service.LogLevel, binary='cinder-scheduler'
30+
)
31+
self.volume_sdk_client.get_service_log_levels.return_value = [
32+
self.log_level
33+
]
3934

40-
# Get the command object to test
4135
self.cmd = service.BlockStorageLogLevelList(self.app, None)
4236

4337
def test_block_storage_log_level_list(self):
4438
self.set_volume_api_version('3.32')
4539

4640
arglist = [
4741
'--host',
48-
self.service_log.host,
42+
self.log_level.host,
4943
'--service',
50-
self.service_log.binary,
44+
self.log_level.binary,
5145
'--log-prefix',
52-
self.service_log.prefix,
46+
'cinder.',
5347
]
5448
verifylist = [
55-
('host', self.service_log.host),
56-
('service', self.service_log.binary),
57-
('log_prefix', self.service_log.prefix),
49+
('host', self.log_level.host),
50+
('service', self.log_level.binary),
51+
('log_prefix', 'cinder.'),
5852
]
5953
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
6054

@@ -66,40 +60,35 @@ def test_block_storage_log_level_list(self):
6660
'Prefix',
6761
'Level',
6862
]
69-
70-
# confirming if all expected columns are present in the result.
71-
self.assertEqual(expected_columns, columns)
72-
73-
datalist = (
63+
datalist = tuple(
7464
(
75-
self.service_log.binary,
76-
self.service_log.host,
77-
self.service_log.prefix,
78-
self.service_log.level,
79-
),
65+
self.log_level.binary,
66+
self.log_level.host,
67+
prefix,
68+
level,
69+
)
70+
for prefix, level in self.log_level.levels.values()
8071
)
81-
82-
# confirming if all expected values are present in the result.
72+
self.assertEqual(expected_columns, columns)
8373
self.assertEqual(datalist, tuple(data))
8474

85-
# checking if proper call was made to get log level of services
86-
self.service_mock.get_log_levels.assert_called_with(
87-
server=self.service_log.host,
88-
binary=self.service_log.binary,
89-
prefix=self.service_log.prefix,
75+
self.volume_sdk_client.get_service_log_levels.assert_called_with(
76+
server=self.log_level.host,
77+
binary=self.log_level.binary,
78+
prefix='cinder.',
9079
)
9180

9281
def test_block_storage_log_level_list_pre_332(self):
9382
arglist = [
9483
'--host',
95-
self.service_log.host,
84+
self.log_level.host,
9685
'--service',
9786
'cinder-api',
9887
'--log-prefix',
9988
'cinder_test.api.common',
10089
]
10190
verifylist = [
102-
('host', self.service_log.host),
91+
('host', self.log_level.host),
10392
('service', 'cinder-api'),
10493
('log_prefix', 'cinder_test.api.common'),
10594
]
@@ -117,14 +106,14 @@ def test_block_storage_log_level_list_invalid_service_name(self):
117106

118107
arglist = [
119108
'--host',
120-
self.service_log.host,
109+
self.log_level.host,
121110
'--service',
122111
'nova-api',
123112
'--log-prefix',
124113
'cinder_test.api.common',
125114
]
126115
verifylist = [
127-
('host', self.service_log.host),
116+
('host', self.log_level.host),
128117
('service', 'nova-api'),
129118
('log_prefix', 'cinder_test.api.common'),
130119
]
@@ -139,13 +128,15 @@ def test_block_storage_log_level_list_invalid_service_name(self):
139128

140129

141130
@ddt.ddt
142-
class TestBlockStorageLogLevelSet(TestService):
143-
service_log = volume_fakes.create_service_log_level_entry()
144-
131+
class TestBlockStorageLogLevelSet(volume_fakes.TestVolume):
145132
def setUp(self):
146133
super().setUp()
147134

148-
# Get the command object to test
135+
self.log_level = sdk_fakes.generate_fake_resource(
136+
_service.LogLevel, binary='cinder-api'
137+
)
138+
self.volume_sdk_client.set_service_log_levels.return_value = None
139+
149140
self.cmd = service.BlockStorageLogLevelSet(self.app, None)
150141

151142
def test_block_storage_log_level_set(self):
@@ -154,45 +145,45 @@ def test_block_storage_log_level_set(self):
154145
arglist = [
155146
'ERROR',
156147
'--host',
157-
self.service_log.host,
148+
self.log_level.host,
158149
'--service',
159-
self.service_log.binary,
150+
self.log_level.binary,
160151
'--log-prefix',
161-
self.service_log.prefix,
152+
'cinder.api.common',
162153
]
163154
verifylist = [
164155
('level', 'ERROR'),
165-
('host', self.service_log.host),
166-
('service', self.service_log.binary),
167-
('log_prefix', self.service_log.prefix),
156+
('host', self.log_level.host),
157+
('service', self.log_level.binary),
158+
('log_prefix', 'cinder.api.common'),
168159
]
169160
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
170161

171-
self.cmd.take_action(parsed_args)
162+
ret = self.cmd.take_action(parsed_args)
172163

173-
# checking if proper call was made to set log level of services
174-
self.service_mock.set_log_levels.assert_called_with(
164+
self.assertIsNone(ret)
165+
self.volume_sdk_client.set_service_log_levels.assert_called_with(
175166
level='ERROR',
176-
server=self.service_log.host,
177-
binary=self.service_log.binary,
178-
prefix=self.service_log.prefix,
167+
server=self.log_level.host,
168+
binary=self.log_level.binary,
169+
prefix='cinder.api.common',
179170
)
180171

181172
def test_block_storage_log_level_set_pre_332(self):
182173
arglist = [
183174
'ERROR',
184175
'--host',
185-
self.service_log.host,
176+
self.log_level.host,
186177
'--service',
187178
'cinder-api',
188179
'--log-prefix',
189-
'cinder_test.api.common',
180+
'cinder.api.common',
190181
]
191182
verifylist = [
192183
('level', 'ERROR'),
193-
('host', self.service_log.host),
184+
('host', self.log_level.host),
194185
('service', 'cinder-api'),
195-
('log_prefix', 'cinder_test.api.common'),
186+
('log_prefix', 'cinder.api.common'),
196187
]
197188
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
198189

@@ -209,15 +200,15 @@ def test_block_storage_log_level_set_invalid_service_name(self):
209200
arglist = [
210201
'ERROR',
211202
'--host',
212-
self.service_log.host,
203+
self.log_level.host,
213204
'--service',
214205
'nova-api',
215206
'--log-prefix',
216207
'cinder.api.common',
217208
]
218209
verifylist = [
219210
('level', 'ERROR'),
220-
('host', self.service_log.host),
211+
('host', self.log_level.host),
221212
('service', 'nova-api'),
222213
('log_prefix', 'cinder.api.common'),
223214
]
@@ -237,15 +228,15 @@ def test_block_storage_log_level_set_log_level(self, log_level):
237228
arglist = [
238229
log_level,
239230
'--host',
240-
self.service_log.host,
231+
self.log_level.host,
241232
'--service',
242233
'cinder-api',
243234
'--log-prefix',
244235
'cinder.api.common',
245236
]
246237
verifylist = [
247238
('level', log_level.upper()),
248-
('host', self.service_log.host),
239+
('host', self.log_level.host),
249240
('service', 'cinder-api'),
250241
('log_prefix', 'cinder.api.common'),
251242
]
@@ -263,10 +254,9 @@ def test_block_storage_log_level_set_log_level(self, log_level):
263254

264255
self.cmd.take_action(parsed_args)
265256

266-
# checking if proper call was made to set log level of services
267-
self.service_mock.set_log_levels.assert_called_with(
257+
self.volume_sdk_client.set_service_log_levels.assert_called_with(
268258
level=log_level.upper(),
269-
server=self.service_log.host,
270-
binary=self.service_log.binary,
271-
prefix=self.service_log.prefix,
259+
server=self.log_level.host,
260+
binary=self.log_level.binary,
261+
prefix='cinder.api.common',
272262
)

0 commit comments

Comments
 (0)