Revision 34b6ab97
| b/lib/cmdlib.py | ||
|---|---|---|
| 4147 | 4147 |
idict["hvm_disk_type"] = instance.hvm_disk_type |
| 4148 | 4148 |
|
| 4149 | 4149 |
if htkind in constants.HTS_REQ_PORT: |
| 4150 |
if instance.network_port is None: |
|
| 4151 |
vnc_console_port = None |
|
| 4152 |
elif instance.vnc_bind_address == constants.BIND_ADDRESS_GLOBAL: |
|
| 4153 |
vnc_console_port = "%s:%s"% (instance.primary_node, |
|
| 4154 |
instance.network_port) |
|
| 4155 |
else: |
|
| 4156 |
vnc_console_port = "%s:%s" % (instance.vnc_bind_address, |
|
| 4157 |
instance.network_port) |
|
| 4158 |
idict["vnc_console_port"] = vnc_console_port |
|
| 4150 | 4159 |
idict["vnc_bind_address"] = instance.vnc_bind_address |
| 4151 | 4160 |
idict["network_port"] = instance.network_port |
| 4152 | 4161 |
|
| b/scripts/gnt-instance | ||
|---|---|---|
| 689 | 689 |
buf.write(" - virtual disk type: %s\n" % instance["hvm_disk_type"])
|
| 690 | 690 |
if instance.has_key("vnc_bind_address"):
|
| 691 | 691 |
buf.write(" VNC bind address: %s\n" % instance["vnc_bind_address"])
|
| 692 |
buf.write(" VNC console port: %s\n" % instance["vnc_console_port"])
|
|
| 692 | 693 |
buf.write(" Hardware:\n")
|
| 693 | 694 |
buf.write(" - VCPUs: %d\n" % instance["vcpus"])
|
| 694 | 695 |
buf.write(" - memory: %dMiB\n" % instance["memory"])
|
Also available in: Unified diff