1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import collections
import copy
import uuid
from osc_placement.tests.functional import base
class TestInventory(base.BaseTestCase):
def setUp(self):
super(TestInventory, self).setUp()
self.rp = self.resource_provider_create()
def test_inventory_show(self):
rp_uuid = self.rp['uuid']
updates = {
'min_unit': 1,
'max_unit': 12,
'reserved': 0,
'step_size': 1,
'total': 12,
'allocation_ratio': 16.0,
}
expected = updates.copy()
expected['used'] = 0
args = ['VCPU:%s=%s' % (k, v) for k, v in updates.items()]
self.resource_inventory_set(rp_uuid, *args)
self.assertEqual(
expected,
self.resource_inventory_show(rp_uuid, 'VCPU', include_used=True),
)
def test_inventory_show_not_found(self):
rp_uuid = self.rp['uuid']
exc = self.assertRaises(base.CommandException,
self.resource_inventory_show,
rp_uuid, 'VCPU')
self.assertIn('No inventory of class VCPU for {}'.format(rp_uuid),
str(exc))
def test_inventory_list(self):
rp_uuid = self.rp['uuid']
updates = {
'min_unit': 1,
'max_unit': 12,
'reserved': 0,
'step_size': 1,
'total': 12,
'allocation_ratio': 16.0,
}
expected = [updates.copy()]
expected[0]['resource_class'] = 'VCPU'
expected[0]['used'] = 0
args = ['VCPU:%s=%s' % (k, v) for k, v in updates.items()]
self.resource_inventory_set(rp_uuid, *args)
self.assertEqual(
expected, self.resource_inventory_list(rp_uuid, include_used=True),
)
def test_inventory_delete(self):
rp_uuid = self.rp['uuid']
self.resource_inventory_set(rp_uuid, 'VCPU=8')
self.resource_inventory_delete(rp_uuid, 'VCPU')
exc = self.assertRaises(base.CommandException,
self.resource_inventory_show,
rp_uuid, 'VCPU')
self.assertIn('No inventory of class VCPU for {}'.format(rp_uuid),
str(exc))
def test_inventory_delete_not_found(self):
exc = self.assertRaises(base.CommandException,
self.resource_inventory_delete,
self.rp['uuid'], 'VCPU')
self.assertIn('No inventory of class VCPU found for delete',
str(exc))
def test_delete_all_inventories(self):
# Negative test to assert command failure because
# microversion < 1.5 and --resource-class is not specified.
self.assertCommandFailed(
base.ARGUMENTS_REQUIRED % '--resource-class',
self.resource_inventory_delete,
'fake_uuid')
class TestSetInventory(base.BaseTestCase):
def test_fail_if_no_rp(self):
exc = self.assertRaises(
base.CommandException,
self.openstack, 'resource provider inventory set')
self.assertIn(base.ARGUMENTS_MISSING, str(exc))
def test_set_empty_inventories(self):
rp = self.resource_provider_create()
self.assertEqual([], self.resource_inventory_set(rp['uuid']))
def test_fail_if_incorrect_resource(self):
rp = self.resource_provider_create()
# wrong format
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
rp['uuid'], 'VCPU')
self.assertIn('must have "name=value"', str(exc))
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
rp['uuid'], 'VCPU==')
self.assertIn('must have "name=value"', str(exc))
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
rp['uuid'], '=10')
self.assertIn('must be not empty', str(exc))
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
rp['uuid'], 'v=')
self.assertIn('must be not empty', str(exc))
# unknown class
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
rp['uuid'], 'UNKNOWN_CPU=16')
self.assertIn('Unknown resource class', str(exc))
# unknown property
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
rp['uuid'], 'VCPU:fake=16')
self.assertIn('Unknown inventory field', str(exc))
def test_set_multiple_classes(self):
rp = self.resource_provider_create()
resp = self.resource_inventory_set(
rp['uuid'],
'VCPU=8',
'VCPU:max_unit=4',
'MEMORY_MB=1024',
'MEMORY_MB:reserved=256',
'DISK_GB=16',
'DISK_GB:allocation_ratio=1.5',
'DISK_GB:min_unit=2',
'DISK_GB:step_size=2')
def check(inventories):
self.assertEqual(8, inventories['VCPU']['total'])
self.assertEqual(4, inventories['VCPU']['max_unit'])
self.assertEqual(1024, inventories['MEMORY_MB']['total'])
self.assertEqual(256, inventories['MEMORY_MB']['reserved'])
self.assertEqual(16, inventories['DISK_GB']['total'])
self.assertEqual(2, inventories['DISK_GB']['min_unit'])
self.assertEqual(2, inventories['DISK_GB']['step_size'])
self.assertEqual(1.5, inventories['DISK_GB']['allocation_ratio'])
check({r['resource_class']: r for r in resp})
resp = self.resource_inventory_list(rp['uuid'])
check({r['resource_class']: r for r in resp})
def test_set_known_and_unknown_class(self):
rp = self.resource_provider_create()
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
rp['uuid'], 'VCPU=8', 'UNKNOWN=4')
self.assertIn('Unknown resource class', str(exc))
self.assertEqual([], self.resource_inventory_list(rp['uuid']))
def test_replace_previous_values(self):
"""Test each new set call replaces previous inventories totally."""
rp = self.resource_provider_create()
# set disk inventory first
self.resource_inventory_set(rp['uuid'], 'DISK_GB=16')
# set memory and vcpu inventories
self.resource_inventory_set(rp['uuid'], 'MEMORY_MB=16', 'VCPU=32')
resp = self.resource_inventory_list(rp['uuid'])
inv = {r['resource_class']: r for r in resp}
# no disk inventory as it was overwritten
self.assertNotIn('DISK_GB', inv)
self.assertIn('VCPU', inv)
self.assertIn('MEMORY_MB', inv)
def test_delete_via_set(self):
rp = self.resource_provider_create()
self.resource_inventory_set(rp['uuid'], 'DISK_GB=16')
self.resource_inventory_set(rp['uuid'])
self.assertEqual([], self.resource_inventory_list(rp['uuid']))
def test_fail_if_incorrect_parameters_set_class_inventory(self):
exc = self.assertRaises(
base.CommandException,
self.openstack, 'resource provider inventory class set')
self.assertIn(base.ARGUMENTS_MISSING, str(exc))
exc = self.assertRaises(
base.CommandException,
self.openstack, 'resource provider inventory class set fake_uuid')
self.assertIn(base.ARGUMENTS_MISSING, str(exc))
exc = self.assertRaises(
base.CommandException,
self.openstack,
('resource provider inventory class set '
'fake_uuid fake_class --total 5 --unknown 1'))
self.assertIn('unrecognized arguments', str(exc))
# Valid RP UUID and resource class, but no inventory field.
rp = self.resource_provider_create()
exc = self.assertRaises(
base.CommandException, self.openstack,
'resource provider inventory class set %s VCPU' % rp['uuid'])
self.assertIn(base.ARGUMENTS_REQUIRED % '--total',
str(exc))
def test_set_inventory_for_resource_class(self):
rp = self.resource_provider_create()
self.resource_inventory_set(rp['uuid'], 'MEMORY_MB=16', 'VCPU=32')
self.resource_inventory_class_set(
rp['uuid'], 'MEMORY_MB', total=128, step_size=16)
resp = self.resource_inventory_list(rp['uuid'])
inv = {r['resource_class']: r for r in resp}
self.assertEqual(128, inv['MEMORY_MB']['total'])
self.assertEqual(16, inv['MEMORY_MB']['step_size'])
self.assertEqual(32, inv['VCPU']['total'])
def test_fail_aggregate_arg_version_handling(self):
agg = str(uuid.uuid4())
self.assertCommandFailed(
'Operation or argument is not supported with version 1.0; '
'requires at least version 1.3',
self.resource_inventory_set,
agg, 'MEMORY_MB=16', aggregate=True)
def test_amend_multiple_classes(self):
# Tests that amending previously nonexistent resource class inventories
# results in creation of inventory for them
# Create a resource provider with no inventory
rp = self.resource_provider_create()
resp = self.resource_inventory_set(
rp['uuid'],
'VCPU=8',
'VCPU:max_unit=4',
'MEMORY_MB=1024',
'MEMORY_MB:reserved=256',
'DISK_GB=16',
'DISK_GB:allocation_ratio=1.5',
'DISK_GB:min_unit=2',
'DISK_GB:step_size=2',
amend=True)
def check(inventories):
self.assertEqual(8, inventories['VCPU']['total'])
self.assertEqual(4, inventories['VCPU']['max_unit'])
self.assertEqual(1024, inventories['MEMORY_MB']['total'])
self.assertEqual(256, inventories['MEMORY_MB']['reserved'])
self.assertEqual(16, inventories['DISK_GB']['total'])
self.assertEqual(1.5, inventories['DISK_GB']['allocation_ratio'])
self.assertEqual(2, inventories['DISK_GB']['min_unit'])
self.assertEqual(2, inventories['DISK_GB']['step_size'])
inventories = {r['resource_class']: r for r in resp}
check(inventories)
resp = self.resource_inventory_list(rp['uuid'])
inventories = {r['resource_class']: r for r in resp}
check(inventories)
# Test amending of one resource class inventory
resp = self.resource_inventory_set(
rp['uuid'],
'VCPU:allocation_ratio=5.0',
amend=True)
inventories = {r['resource_class']: r for r in resp}
check(inventories)
self.assertEqual(5.0, inventories['VCPU']['allocation_ratio'])
resp = self.resource_inventory_list(rp['uuid'])
inventories = {r['resource_class']: r for r in resp}
check(inventories)
self.assertEqual(5.0, inventories['VCPU']['allocation_ratio'])
def test_dry_run(self):
rp = self.resource_provider_create()
resp = self.resource_inventory_set(
rp['uuid'],
'VCPU=8',
'VCPU:max_unit=4',
'MEMORY_MB=1024',
'MEMORY_MB:reserved=256',
'DISK_GB=16',
'DISK_GB:allocation_ratio=1.5',
'DISK_GB:min_unit=2',
'DISK_GB:step_size=2',
dry_run=True)
def check(inventories):
self.assertEqual(8, inventories['VCPU']['total'])
self.assertEqual(4, inventories['VCPU']['max_unit'])
self.assertEqual(1024, inventories['MEMORY_MB']['total'])
self.assertEqual(256, inventories['MEMORY_MB']['reserved'])
self.assertEqual(16, inventories['DISK_GB']['total'])
self.assertEqual(2, inventories['DISK_GB']['min_unit'])
self.assertEqual(2, inventories['DISK_GB']['step_size'])
self.assertEqual(1.5, inventories['DISK_GB']['allocation_ratio'])
# We expect the return value from the set command to reflect the values
# passed to the command (a preview of what would be set if not for
# --dry-run)
check({r['resource_class']: r for r in resp})
# But we expect the return value from the list command to be empty
# since we used --dry-run and didn't actually effect any changes
resp = self.resource_inventory_list(rp['uuid'])
self.assertEqual([], resp)
class TestInventory15(TestInventory):
VERSION = '1.5'
def test_delete_all_inventories(self):
rp = self.resource_provider_create()
self.resource_inventory_set(rp['uuid'], 'MEMORY_MB=16', 'VCPU=32')
self.resource_inventory_delete(rp['uuid'])
self.assertEqual([], self.resource_inventory_list(rp['uuid']))
class TestAggregateInventory(base.BaseTestCase):
VERSION = '1.3'
def _test_dry_run(self, agg, rps, old_inventories, amend=False):
new_resources = ['VCPU:allocation_ratio=5.0',
'MEMORY_MB:allocation_ratio=6.0',
'DISK_GB:allocation_ratio=7.0']
resp = self.resource_inventory_set(
agg, *new_resources, aggregate=True, amend=amend, dry_run=True)
# Use empty dict to get expected values for full replacement
inventories = old_inventories if amend else [{}] * len(old_inventories)
# A list of dict keyed by resource class of dict of inventories
# Each list element corresponds to one resource provider
new_inventories = self._get_expected_inventories(
inventories, new_resources)
# To compare with actual result, reformat new_inventories to
# a dict, keyed by resource provider uuid, of dict of inventories
# keyed by resource class
expected = {}
for rp, inventory in zip(rps, new_inventories):
for rc, inv in inventory.items():
inv['resource_provider'] = rp['uuid']
# For full replacement (not amend) case these values should
# be set to empty string.
for key in ('max_unit', 'min_unit', 'reserved', 'step_size',
'total', 'reserved', 'step_size'):
if key not in inv:
inv[key] = ''
expected[rp['uuid']] = inventory
# Reformat raw response (list of inventories) as well
resp_dict = collections.defaultdict(dict)
for row in resp:
resp_dict[row['resource_provider']][row['resource_class']] = row
self.assertEqual(expected, resp_dict)
# Verify the inventories weren't changed (--dry-run)
for i, rp in enumerate(rps):
resp = self.resource_inventory_list(rp['uuid'])
self.assertDictEqual(old_inventories[i],
{r['resource_class']: r for r in resp})
def _get_expected_inventories(self, old_inventories, resources):
new_inventories = []
for old_inventory in old_inventories:
new_inventory = collections.defaultdict(dict)
new_inventory.update(copy.deepcopy(old_inventory))
for resource in resources:
rc, keyval = resource.split(':')
key, val = keyval.split('=')
# Handle allocation ratio which is a float
val = float(val) if '.' in val else int(val)
new_inventory[rc][key] = val
# The resource_class field is added by the osc_placement CLI,
# so add it to our expected inventories
if 'resource_class' not in new_inventory[rc]:
new_inventory[rc]['resource_class'] = rc
new_inventories.append(new_inventory)
return new_inventories
def _setup_two_resource_providers_in_aggregate(self):
rps = []
invs = []
inventory2 = ['VCPU=8',
'VCPU:max_unit=4',
'VCPU:allocation_ratio=16.0',
'MEMORY_MB=1024',
'MEMORY_MB:reserved=256',
'MEMORY_MB:allocation_ratio=2.5',
'DISK_GB=16',
'DISK_GB:allocation_ratio=1.5',
'DISK_GB:min_unit=2',
'DISK_GB:step_size=2']
inventory1 = inventory2 + ['VGPU=8',
'VGPU:allocation_ratio=1.0',
'VGPU:min_unit=2',
'VGPU:step_size=2']
for i, inventory in enumerate([inventory1, inventory2]):
rps.append(self.resource_provider_create())
resp = self.resource_inventory_set(rps[i]['uuid'], *inventory)
# Verify the resource_provider column is not present without
# --aggregate
self.assertNotIn('resource_provider', resp)
invs.append({r['resource_class']: r for r in resp})
# Put both resource providers in the same aggregate
agg = str(uuid.uuid4())
for rp in rps:
self.resource_provider_aggregate_set(rp['uuid'], agg)
return rps, agg, invs
def test_fail_if_no_rps_in_aggregate(self):
nonexistent_agg = str(uuid.uuid4())
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
nonexistent_agg,
'VCPU=8',
aggregate=True)
self.assertIn('No resource providers found in aggregate with uuid {}'
.format(nonexistent_agg), str(exc))
def test_with_aggregate_one_fails(self):
# Set up some existing inventories with two resource providers
rps, agg, _invs = self._setup_two_resource_providers_in_aggregate()
# Set a custom resource class inventory on the first resource provider
self.resource_class_create('CUSTOM_FOO')
rp1_uuid = rps[0]['uuid']
rp1_inv = self.resource_inventory_set(rp1_uuid, 'CUSTOM_FOO=1')
# Create an allocation for custom resource class on first provider
consumer = str(uuid.uuid4())
alloc = 'rp=%s,CUSTOM_FOO=1' % rp1_uuid
self.resource_allocation_set(consumer, [alloc])
# Try to set allocation ratio for an aggregate. The first set should
# fail because we're not going to set the custom resource class (which
# is equivalent to trying to remove it) and removal isn't allowed if
# there is an allocation of it present. The second set should succeed
new_resources = ['VCPU:allocation_ratio=5.0', 'VCPU:total=8']
exc = self.assertRaises(base.CommandException,
self.resource_inventory_set,
agg, *new_resources, aggregate=True)
self.assertIn('Failed to set inventory for 1 of 2 resource providers.',
str(exc))
output = self.output.getvalue() + self.error.getvalue()
self.assertIn('Failed to set inventory for resource provider %s:' %
rp1_uuid, output)
err_txt = ("Inventory for 'CUSTOM_FOO' on resource provider '%s' in "
"use." % rp1_uuid)
self.assertIn(err_txt, output)
# Placement will default the following internally
placement_defaults = ['VCPU:max_unit=2147483647',
'VCPU:min_unit=1',
'VCPU:reserved=0',
'VCPU:step_size=1']
# Get expected inventory for the second resource provider (succeeded)
new_inventories = self._get_expected_inventories(
# Since inventories are expected to be fully replaced,
# use empty dict for old inventory
[{}],
new_resources + placement_defaults)
resp = self.resource_inventory_list(rps[1]['uuid'])
self.assertDictEqual(new_inventories[0],
{r['resource_class']: r for r in resp})
# First resource provider should have remained the same (failed)
resp = self.resource_inventory_list(rp1_uuid)
self.assertDictEqual({r['resource_class']: r for r in rp1_inv},
{r['resource_class']: r for r in resp})
def _test_with_aggregate(self, amend=False):
# Set up some existing inventories with two resource providers
rps, agg, old_invs = self._setup_two_resource_providers_in_aggregate()
# Verify that --dry-run works properly
self._test_dry_run(agg, rps, old_invs, amend=amend)
# If we're not amending inventory, set some defaults that placement
# will set internally and return when we list inventories later
if not amend:
old_invs = []
defaults = {'max_unit': 2147483647,
'min_unit': 1,
'reserved': 0,
'step_size': 1}
default_inventory = {'VCPU': copy.deepcopy(defaults)}
for rp in rps:
old_invs.append(default_inventory)
# Now, go ahead and update an allocation ratio and verify
new_resources = ['VCPU:allocation_ratio=5.0',
'VCPU:total=8']
resp = self.resource_inventory_set(agg, *new_resources, aggregate=True,
amend=amend)
# Verify the resource_provider column is present with --aggregate
for rp in resp:
self.assertIn('resource_provider', rp)
new_inventories = self._get_expected_inventories(old_invs,
new_resources)
for i, rp in enumerate(rps):
resp = self.resource_inventory_list(rp['uuid'])
self.assertDictEqual(new_inventories[i],
{r['resource_class']: r for r in resp})
def test_with_aggregate(self):
self._test_with_aggregate()
def test_amend_with_aggregate(self):
self._test_with_aggregate(amend=True)
|
