Revision 4f725341 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 1028 | 1028 |
""" |
| 1029 | 1029 |
if value in [None, constants.VALUE_AUTO]: |
| 1030 | 1030 |
return None |
| 1031 |
max_v = ipolicy[constants.MAX_ISPECS].get(name, value)
|
|
| 1032 |
min_v = ipolicy[constants.MIN_ISPECS].get(name, value)
|
|
| 1031 |
max_v = ipolicy[constants.ISPECS_MAX].get(name, value)
|
|
| 1032 |
min_v = ipolicy[constants.ISPECS_MIN].get(name, value)
|
|
| 1033 | 1033 |
if value > max_v or min_v > value: |
| 1034 | 1034 |
return ("%s value %s is not in range [%s, %s]" %
|
| 1035 | 1035 |
(name, value, min_v, max_v)) |
| ... | ... | |
| 2151 | 2151 |
nic_count = len(instance.nics) |
| 2152 | 2152 |
|
| 2153 | 2153 |
test_settings = [ |
| 2154 |
(constants.MEM_SIZE_SPEC, mem_size),
|
|
| 2155 |
(constants.CPU_COUNT_SPEC, cpu_count),
|
|
| 2156 |
(constants.DISK_COUNT_SPEC, disk_count),
|
|
| 2157 |
(constants.NIC_COUNT_SPEC, nic_count),
|
|
| 2158 |
] + map((lambda d: (constants.DISK_SIZE_SPEC, d)), disk_sizes)
|
|
| 2154 |
(constants.ISPEC_MEM_SIZE, mem_size),
|
|
| 2155 |
(constants.ISPEC_CPU_COUNT, cpu_count),
|
|
| 2156 |
(constants.ISPEC_DISK_COUNT, disk_count),
|
|
| 2157 |
(constants.ISPEC_NIC_COUNT, nic_count),
|
|
| 2158 |
] + map((lambda d: (constants.ISPEC_DISK_SIZE, d)), disk_sizes)
|
|
| 2159 | 2159 |
|
| 2160 | 2160 |
for (name, value) in test_settings: |
| 2161 | 2161 |
test_result = _CheckMinMaxSpecs(name, ipolicy, value) |
Also available in: Unified diff