Revision 976b78ba lib/objects.py
b/lib/objects.py | ||
---|---|---|
186 | 186 |
ispecs_disk_size=None, |
187 | 187 |
ispecs_nic_count=None, |
188 | 188 |
ipolicy_disk_templates=None, |
189 |
ipolicy_vcpu_ratio=None, |
|
189 | 190 |
group_ipolicy=False, |
190 | 191 |
allowed_values=None, |
191 | 192 |
fill_all=False): |
... | ... | |
221 | 222 |
for key, val in specs.items(): # {min: .. ,max: .., std: ..} |
222 | 223 |
ipolicy_out[key][name] = val |
223 | 224 |
|
224 |
# no filldict for lists |
|
225 |
if not group_ipolicy and fill_all and ipolicy_disk_templates is None: |
|
226 |
ipolicy_disk_templates = constants.DISK_TEMPLATES |
|
225 |
# no filldict for non-dicts |
|
226 |
if not group_ipolicy and fill_all: |
|
227 |
if ipolicy_disk_templates is None: |
|
228 |
ipolicy_disk_templates = constants.DISK_TEMPLATES |
|
229 |
if ipolicy_vcpu_ratio is None: |
|
230 |
ipolicy_vcpu_ratio = \ |
|
231 |
constants.IPOLICY_DEFAULTS[constants.IPOLICY_VCPU_RATIO] |
|
227 | 232 |
if ipolicy_disk_templates is not None: |
228 | 233 |
ipolicy_out[constants.IPOLICY_DTS] = list(ipolicy_disk_templates) |
234 |
if ipolicy_vcpu_ratio is not None: |
|
235 |
ipolicy_out[constants.IPOLICY_VCPU_RATIO] = ipolicy_vcpu_ratio |
|
229 | 236 |
|
230 | 237 |
assert not (frozenset(ipolicy_out.keys()) - constants.IPOLICY_ALL_KEYS) |
231 | 238 |
|
Also available in: Unified diff