Revision d04c9d45 lib/objects.py
| b/lib/objects.py | ||
|---|---|---|
| 103 | 103 |
custom_ipolicy.get(key, {}),
|
| 104 | 104 |
skip_keys=skip_keys) |
| 105 | 105 |
# list items |
| 106 |
for key in [constants.ISPECS_DTS]:
|
|
| 106 |
for key in [constants.IPOLICY_DTS]:
|
|
| 107 | 107 |
ret_dict[key] = list(custom_ipolicy.get(key, default_ipolicy[key])) |
| 108 | 108 |
|
| 109 | 109 |
return ret_dict |
| ... | ... | |
| 182 | 182 |
ispecs_disk_count=None, |
| 183 | 183 |
ispecs_disk_size=None, |
| 184 | 184 |
ispecs_nic_count=None, |
| 185 |
ispecs_disk_templates=None,
|
|
| 185 |
ipolicy_disk_templates=None,
|
|
| 186 | 186 |
group_ipolicy=False, |
| 187 | 187 |
allowed_values=None, |
| 188 | 188 |
fill_all=False): |
| ... | ... | |
| 219 | 219 |
ipolicy_out[key][name] = val |
| 220 | 220 |
|
| 221 | 221 |
# no filldict for lists |
| 222 |
if not group_ipolicy and fill_all and ispecs_disk_templates is None:
|
|
| 223 |
ispecs_disk_templates = constants.DISK_TEMPLATES
|
|
| 224 |
if ispecs_disk_templates is not None:
|
|
| 225 |
ipolicy_out[constants.ISPECS_DTS] = list(ispecs_disk_templates)
|
|
| 222 |
if not group_ipolicy and fill_all and ipolicy_disk_templates is None:
|
|
| 223 |
ipolicy_disk_templates = constants.DISK_TEMPLATES
|
|
| 224 |
if ipolicy_disk_templates is not None:
|
|
| 225 |
ipolicy_out[constants.IPOLICY_DTS] = list(ipolicy_disk_templates)
|
|
| 226 | 226 |
|
| 227 | 227 |
assert not (frozenset(ipolicy_out.keys()) - constants.IPOLICY_ALL_KEYS) |
| 228 | 228 |
|
| ... | ... | |
| 887 | 887 |
""" |
| 888 | 888 |
for param in constants.ISPECS_PARAMETERS: |
| 889 | 889 |
InstancePolicy.CheckISpecSyntax(ipolicy, param) |
| 890 |
if constants.ISPECS_DTS in ipolicy:
|
|
| 891 |
InstancePolicy.CheckDiskTemplates(ipolicy[constants.ISPECS_DTS])
|
|
| 890 |
if constants.IPOLICY_DTS in ipolicy:
|
|
| 891 |
InstancePolicy.CheckDiskTemplates(ipolicy[constants.IPOLICY_DTS])
|
|
| 892 | 892 |
wrong_keys = frozenset(ipolicy.keys()) - constants.IPOLICY_ALL_KEYS |
| 893 | 893 |
if wrong_keys: |
| 894 | 894 |
raise errors.ConfigurationError("Invalid keys in ipolicy: %s" %
|
Also available in: Unified diff