Revision 21bcb9aa
| b/lib/cli.py | ||
|---|---|---|
| 1396 | 1396 |
|
| 1397 | 1397 |
if opts.nics: |
| 1398 | 1398 |
try: |
| 1399 |
nic_max = max(int(nidx[0])+1 for nidx in opts.nics)
|
|
| 1399 |
nic_max = max(int(nidx[0]) + 1 for nidx in opts.nics)
|
|
| 1400 | 1400 |
except ValueError, err: |
| 1401 | 1401 |
raise errors.OpPrereqError("Invalid NIC index passed: %s" % str(err))
|
| 1402 | 1402 |
nics = [{}] * nic_max
|
| ... | ... | |
| 1427 | 1427 |
if opts.sd_size is not None: |
| 1428 | 1428 |
opts.disks = [(0, {"size": opts.sd_size})]
|
| 1429 | 1429 |
try: |
| 1430 |
disk_max = max(int(didx[0])+1 for didx in opts.disks)
|
|
| 1430 |
disk_max = max(int(didx[0]) + 1 for didx in opts.disks)
|
|
| 1431 | 1431 |
except ValueError, err: |
| 1432 | 1432 |
raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err))
|
| 1433 | 1433 |
disks = [{}] * disk_max
|
| b/lib/cmdlib.py | ||
|---|---|---|
| 7671 | 7671 |
continue |
| 7672 | 7672 |
if nic_op != constants.DDM_ADD: |
| 7673 | 7673 |
# an existing nic |
| 7674 |
if not instance.nics: |
|
| 7675 |
raise errors.OpPrereqError("Invalid NIC index %s, instance has"
|
|
| 7676 |
" no NICs" % nic_op, |
|
| 7677 |
errors.ECODE_INVAL) |
|
| 7674 | 7678 |
if nic_op < 0 or nic_op >= len(instance.nics): |
| 7675 | 7679 |
raise errors.OpPrereqError("Invalid NIC index %s, valid values"
|
| 7676 | 7680 |
" are 0 to %d" % |
| 7677 |
(nic_op, len(instance.nics)), |
|
| 7681 |
(nic_op, len(instance.nics) - 1),
|
|
| 7678 | 7682 |
errors.ECODE_INVAL) |
| 7679 | 7683 |
old_nic_params = instance.nics[nic_op].nicparams |
| 7680 | 7684 |
old_nic_ip = instance.nics[nic_op].ip |
Also available in: Unified diff