Revision 7be048f0 lib/rapi/rlib2.py
| b/lib/rapi/rlib2.py | ||
|---|---|---|
| 508 | 508 |
|
| 509 | 509 |
# Size is mandatory |
| 510 | 510 |
try: |
| 511 |
size = i["size"]
|
|
| 511 |
size = i[constants.IDISK_SIZE]
|
|
| 512 | 512 |
except KeyError: |
| 513 | 513 |
raise http.HttpBadRequest("Disk %d specification wrong: missing disk"
|
| 514 | 514 |
" size" % idx) |
| 515 | 515 |
|
| 516 | 516 |
disk = {
|
| 517 |
"size": size,
|
|
| 517 |
constants.IDISK_SIZE: size,
|
|
| 518 | 518 |
} |
| 519 | 519 |
|
| 520 | 520 |
# Optional disk access mode |
| 521 | 521 |
try: |
| 522 |
disk_access = i["mode"]
|
|
| 522 |
disk_access = i[constants.IDISK_MODE]
|
|
| 523 | 523 |
except KeyError: |
| 524 | 524 |
pass |
| 525 | 525 |
else: |
| 526 |
disk["mode"] = disk_access
|
|
| 526 |
disk[constants.IDISK_MODE] = disk_access
|
|
| 527 | 527 |
|
| 528 | 528 |
disks.append(disk) |
| 529 | 529 |
|
| ... | ... | |
| 538 | 538 |
|
| 539 | 539 |
nic = {}
|
| 540 | 540 |
|
| 541 |
for field in ["mode", "ip", "link", "bridge"]:
|
|
| 541 |
for field in constants.INIC_PARAMS:
|
|
| 542 | 542 |
try: |
| 543 | 543 |
value = i[field] |
| 544 | 544 |
except KeyError: |
Also available in: Unified diff