Commit 5b460366 authored by Iustin Pop's avatar Iustin Pop
Browse files

Some small fixes

This patch removes the admin_ram LUQueryInstances field (is broken
anyway) and fixes the VNC address checks in the Xen Hypervisor.

Reviewed-by: imsnah
parent 8aec325c
...@@ -3137,7 +3137,7 @@ class LUQueryInstances(NoHooksLU): ...@@ -3137,7 +3137,7 @@ class LUQueryInstances(NoHooksLU):
_OP_REQP = ["output_fields", "names", "use_locking"] _OP_REQP = ["output_fields", "names", "use_locking"]
REQ_BGL = False REQ_BGL = False
_FIELDS_STATIC = utils.FieldSet(*["name", "os", "pnode", "snodes", _FIELDS_STATIC = utils.FieldSet(*["name", "os", "pnode", "snodes",
"admin_state", "admin_ram", "admin_state",
"disk_template", "ip", "mac", "bridge", "disk_template", "ip", "mac", "bridge",
"sda_size", "sdb_size", "vcpus", "tags", "sda_size", "sdb_size", "vcpus", "tags",
"network_port", "beparams", "network_port", "beparams",
......
...@@ -527,7 +527,7 @@ class XenHvmHypervisor(XenHypervisor): ...@@ -527,7 +527,7 @@ class XenHvmHypervisor(XenHypervisor):
constants.HT_HVM_VALID_DISK_TYPES)) constants.HT_HVM_VALID_DISK_TYPES))
# vnc_bind_address verification # vnc_bind_address verification
vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS] vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS]
if vnc_bind_address is not None: if vnc_bind_address:
if not utils.IsValidIP(vnc_bind_address): if not utils.IsValidIP(vnc_bind_address):
raise errors.OpPrereqError("given VNC bind address '%s' doesn't look" raise errors.OpPrereqError("given VNC bind address '%s' doesn't look"
" like a valid IP address" % " like a valid IP address" %
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment