Revision 55b7e783
| b/lib/client/gnt_debug.py | ||
|---|---|---|
| 172 | 172 |
vcpus=opts.vcpus, |
| 173 | 173 |
tags=opts.tags, |
| 174 | 174 |
direction=opts.direction, |
| 175 |
allocator=opts.iallocator, |
|
| 175 |
iallocator=opts.iallocator,
|
|
| 176 | 176 |
evac_mode=opts.evac_mode, |
| 177 | 177 |
target_groups=target_groups, |
| 178 | 178 |
spindle_use=opts.spindle_use, |
| b/lib/cmdlib.py | ||
|---|---|---|
| 15533 | 15533 |
self.op.mode, errors.ECODE_INVAL) |
| 15534 | 15534 |
|
| 15535 | 15535 |
if self.op.direction == constants.IALLOCATOR_DIR_OUT: |
| 15536 |
if self.op.allocator is None: |
|
| 15536 |
if self.op.iallocator is None:
|
|
| 15537 | 15537 |
raise errors.OpPrereqError("Missing allocator name",
|
| 15538 | 15538 |
errors.ECODE_INVAL) |
| 15539 | 15539 |
elif self.op.direction != constants.IALLOCATOR_DIR_IN: |
| ... | ... | |
| 15586 | 15586 |
if self.op.direction == constants.IALLOCATOR_DIR_IN: |
| 15587 | 15587 |
result = ial.in_text |
| 15588 | 15588 |
else: |
| 15589 |
ial.Run(self.op.allocator, validate=False) |
|
| 15589 |
ial.Run(self.op.iallocator, validate=False)
|
|
| 15590 | 15590 |
result = ial.out_text |
| 15591 | 15591 |
return result |
| 15592 | 15592 |
|
| b/lib/opcodes.py | ||
|---|---|---|
| 1959 | 1959 |
return the allocator output (direction 'out') |
| 1960 | 1960 |
|
| 1961 | 1961 |
""" |
| 1962 |
OP_DSC_FIELD = "allocator" |
|
| 1962 |
OP_DSC_FIELD = "iallocator"
|
|
| 1963 | 1963 |
OP_PARAMS = [ |
| 1964 | 1964 |
("direction", ht.NoDefault,
|
| 1965 | 1965 |
ht.TElemOf(constants.VALID_IALLOCATOR_DIRECTIONS), None), |
| ... | ... | |
| 1973 | 1973 |
None), |
| 1974 | 1974 |
("disks", ht.NoDefault, ht.TMaybe(ht.TList), None),
|
| 1975 | 1975 |
("hypervisor", None, ht.TMaybeString, None),
|
| 1976 |
("allocator", None, ht.TMaybeString, None),
|
|
| 1976 |
_PIAllocFromDesc(None),
|
|
| 1977 | 1977 |
("tags", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), None),
|
| 1978 | 1978 |
("memory", None, ht.TMaybe(ht.TNonNegativeInt), None),
|
| 1979 | 1979 |
("vcpus", None, ht.TMaybe(ht.TNonNegativeInt), None),
|
Also available in: Unified diff