Revision f824ae42
| b/lib/cli.py | ||
|---|---|---|
| 3812 | 3812 |
group_ipolicy, allowed_values) |
| 3813 | 3813 |
|
| 3814 | 3814 |
if ipolicy_disk_templates is not None: |
| 3815 |
ipolicy_out[constants.IPOLICY_DTS] = list(ipolicy_disk_templates) |
|
| 3815 |
if allowed_values and ipolicy_disk_templates in allowed_values: |
|
| 3816 |
ipolicy_out[constants.IPOLICY_DTS] = ipolicy_disk_templates |
|
| 3817 |
else: |
|
| 3818 |
ipolicy_out[constants.IPOLICY_DTS] = list(ipolicy_disk_templates) |
|
| 3816 | 3819 |
if ipolicy_vcpu_ratio is not None: |
| 3817 | 3820 |
ipolicy_out[constants.IPOLICY_VCPU_RATIO] = ipolicy_vcpu_ratio |
| 3818 | 3821 |
if ipolicy_spindle_ratio is not None: |
| b/test/py/ganeti.cli_unittest.py | ||
|---|---|---|
| 1260 | 1260 |
}, |
| 1261 | 1261 |
constants.ISPECS_STD: {
|
| 1262 | 1262 |
}, |
| 1263 |
constants.IPOLICY_DTS: allowedv, |
|
| 1264 |
constants.IPOLICY_VCPU_RATIO: allowedv, |
|
| 1265 |
constants.IPOLICY_SPINDLE_RATIO: allowedv, |
|
| 1263 | 1266 |
} |
| 1264 | 1267 |
pol1 = cli.CreateIPolicyFromOpts(ispecs_mem_size={},
|
| 1265 | 1268 |
ispecs_cpu_count={"min": allowedv},
|
| 1266 | 1269 |
ispecs_disk_count={},
|
| 1267 | 1270 |
ispecs_disk_size={},
|
| 1268 | 1271 |
ispecs_nic_count={},
|
| 1269 |
ipolicy_disk_templates=None,
|
|
| 1270 |
ipolicy_vcpu_ratio=None,
|
|
| 1271 |
ipolicy_spindle_ratio=None,
|
|
| 1272 |
ipolicy_disk_templates=allowedv,
|
|
| 1273 |
ipolicy_vcpu_ratio=allowedv,
|
|
| 1274 |
ipolicy_spindle_ratio=allowedv,
|
|
| 1272 | 1275 |
allowed_values=[allowedv]) |
| 1273 | 1276 |
self.assertEqual(pol1, exp_pol1) |
| 1274 | 1277 |
|
Also available in: Unified diff