Revision 24838135 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
4423 | 4423 |
"disks": disks, |
4424 | 4424 |
"vcpus": instance.vcpus, |
4425 | 4425 |
"hypervisor": instance.hypervisor, |
4426 |
"network_port": instance.network_port, |
|
4427 |
"hv_instance": instance.hvparams, |
|
4428 |
"hv_actual": self.cfg.GetClusterInfo().FillHV(instance), |
|
4426 | 4429 |
} |
4427 | 4430 |
|
4428 |
htkind = instance.hypervisor |
|
4429 |
if htkind == constants.HT_XEN_PVM: |
|
4430 |
idict["kernel_path"] = instance.kernel_path |
|
4431 |
idict["initrd_path"] = instance.initrd_path |
|
4432 |
|
|
4433 |
if htkind == constants.HT_XEN_HVM: |
|
4434 |
idict["hvm_boot_order"] = instance.hvm_boot_order |
|
4435 |
idict["hvm_acpi"] = instance.hvm_acpi |
|
4436 |
idict["hvm_pae"] = instance.hvm_pae |
|
4437 |
idict["hvm_cdrom_image_path"] = instance.hvm_cdrom_image_path |
|
4438 |
idict["hvm_nic_type"] = instance.hvm_nic_type |
|
4439 |
idict["hvm_disk_type"] = instance.hvm_disk_type |
|
4440 |
|
|
4441 |
if htkind in constants.HTS_REQ_PORT: |
|
4442 |
if instance.vnc_bind_address is None: |
|
4443 |
vnc_bind_address = constants.VNC_DEFAULT_BIND_ADDRESS |
|
4444 |
else: |
|
4445 |
vnc_bind_address = instance.vnc_bind_address |
|
4446 |
if instance.network_port is None: |
|
4447 |
vnc_console_port = None |
|
4448 |
elif vnc_bind_address == constants.BIND_ADDRESS_GLOBAL: |
|
4449 |
vnc_console_port = "%s:%s" % (instance.primary_node, |
|
4450 |
instance.network_port) |
|
4451 |
elif vnc_bind_address == constants.LOCALHOST_IP_ADDRESS: |
|
4452 |
vnc_console_port = "%s:%s on node %s" % (vnc_bind_address, |
|
4453 |
instance.network_port, |
|
4454 |
instance.primary_node) |
|
4455 |
else: |
|
4456 |
vnc_console_port = "%s:%s" % (instance.vnc_bind_address, |
|
4457 |
instance.network_port) |
|
4458 |
idict["vnc_console_port"] = vnc_console_port |
|
4459 |
idict["vnc_bind_address"] = vnc_bind_address |
|
4460 |
idict["network_port"] = instance.network_port |
|
4461 |
|
|
4462 | 4431 |
result[instance.name] = idict |
4463 | 4432 |
|
4464 | 4433 |
return result |
Also available in: Unified diff