Revision 43440815
| b/lib/constants.py | ||
|---|---|---|
| 341 | 341 |
HT_NIC_RTL8139 = "rtl8139" |
| 342 | 342 |
HT_NIC_NE2K_PCI = "ne2k_pci" |
| 343 | 343 |
HT_NIC_NE2K_ISA = "ne2k_isa" |
| 344 |
HT_NIC_I82551 = "i82551" |
|
| 345 |
HT_NIC_I85557B = "i82557b" |
|
| 346 |
HT_NIC_I8259ER = "i82559er" |
|
| 347 |
HT_NIC_PCNET = "pcnet" |
|
| 348 |
HT_NIC_E1000 = "e1000" |
|
| 344 | 349 |
HT_NIC_PARAVIRTUAL = HT_DISK_PARAVIRTUAL = "paravirtual" |
| 345 | 350 |
HT_DISK_IOEMU = "ioemu" |
| 351 |
HT_DISK_IDE = "ide" |
|
| 352 |
HT_DISK_SCSI = "scsi" |
|
| 353 |
HT_DISK_SD = "sd" |
|
| 354 |
HT_DISK_MTD = "mtd" |
|
| 355 |
HT_DISK_PFLASH = "pflash" |
|
| 356 |
|
|
| 346 | 357 |
HT_HVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI, |
| 347 | 358 |
HT_NIC_NE2K_ISA, HT_NIC_PARAVIRTUAL]) |
| 348 | 359 |
HT_HVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IOEMU]) |
| 360 |
HT_KVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI, |
|
| 361 |
HT_NIC_NE2K_ISA, HT_NIC_I82551, |
|
| 362 |
HT_NIC_I85557B, HT_NIC_I8259ER, |
|
| 363 |
HT_NIC_PCNET, HT_NIC_E1000, |
|
| 364 |
HT_NIC_PARAVIRTUAL]) |
|
| 365 |
HT_KVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IDE, |
|
| 366 |
HT_DISK_SCSI, HT_DISK_SD, HT_DISK_MTD, |
|
| 367 |
HT_DISK_PFLASH]) |
|
| 349 | 368 |
|
| 350 | 369 |
# Cluster Verify steps |
| 351 | 370 |
VERIFY_NPLUSONE_MEM = 'nplusone_mem' |
| ... | ... | |
| 443 | 462 |
HV_BOOT_ORDER: "cd", |
| 444 | 463 |
HV_CDROM_IMAGE_PATH: None, |
| 445 | 464 |
HV_NIC_TYPE: HT_NIC_RTL8139, |
| 446 |
HV_DISK_TYPE: HT_DEV_PARAVIRTUAL,
|
|
| 465 |
HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
|
|
| 447 | 466 |
HV_VNC_BIND_ADDRESS: '0.0.0.0', |
| 448 | 467 |
HV_ACPI: True, |
| 449 | 468 |
HV_PAE: True, |
| ... | ... | |
| 460 | 479 |
HV_VNC_X509_VERIFY: False, |
| 461 | 480 |
HV_CDROM_IMAGE_PATH: None, |
| 462 | 481 |
HV_BOOT_ORDER: "disk", |
| 482 |
HV_NIC_TYPE: HT_NIC_PARAVIRTUAL, |
|
| 483 |
HV_DISK_TYPE: HT_DISK_PARAVIRTUAL, |
|
| 463 | 484 |
}, |
| 464 | 485 |
HT_FAKE: {
|
| 465 | 486 |
}, |
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 60 | 60 |
constants.HV_VNC_X509_VERIFY, |
| 61 | 61 |
constants.HV_CDROM_IMAGE_PATH, |
| 62 | 62 |
constants.HV_BOOT_ORDER, |
| 63 |
constants.HV_NIC_TYPE, |
|
| 64 |
constants.HV_DISK_TYPE, |
|
| 63 | 65 |
] |
| 64 | 66 |
|
| 65 | 67 |
_MIGRATION_STATUS_RE = re.compile('Migration\s+status:\s+(\w+)',
|
| ... | ... | |
| 749 | 751 |
if boot_order == 'cdrom' and not iso_path: |
| 750 | 752 |
raise errors.HypervisorError("Cannot boot from cdrom without an ISO path")
|
| 751 | 753 |
|
| 754 |
nic_type = hvparams[constants.HV_NIC_TYPE] |
|
| 755 |
if nic_type not in constants.HT_KVM_VALID_NIC_TYPES: |
|
| 756 |
raise errors.HypervisorError("Invalid NIC type %s specified for the KVM"
|
|
| 757 |
" hypervisor. Please choose one of: %s" % |
|
| 758 |
(nic_type, |
|
| 759 |
constants.HT_KVM_VALID_NIC_TYPES)) |
|
| 760 |
|
|
| 761 |
disk_type = hvparams[constants.HV_DISK_TYPE] |
|
| 762 |
if disk_type not in constants.HT_KVM_VALID_DISK_TYPES: |
|
| 763 |
raise errors.HypervisorError("Invalid disk type %s specified for the KVM"
|
|
| 764 |
" hypervisor. Please choose one of: %s" % |
|
| 765 |
(disk_type, |
|
| 766 |
constants.HT_KVM_VALID_DISK_TYPES)) |
|
| 767 |
|
|
| 752 | 768 |
def ValidateParameters(self, hvparams): |
| 753 | 769 |
"""Check the given parameters for validity. |
| 754 | 770 |
|
Also available in: Unified diff