Revision a744b676 lib/hypervisor/hv_xen.py

b/lib/hypervisor/hv_xen.py
30 30
from ganeti import errors
31 31
from ganeti import utils
32 32
from ganeti.hypervisor import hv_base
33
from ganeti import netutils
33 34

  
34 35

  
35 36
class XenHypervisor(hv_base.BaseHypervisor):
......
409 410

  
410 411
    port = instance.hvparams[constants.HV_MIGRATION_PORT]
411 412

  
412
    if not utils.TcpPing(target, port, live_port_needed=True):
413
    if not netutils.TcpPing(target, port, live_port_needed=True):
413 414
      raise errors.HypervisorError("Remote host %s not listening on port"
414 415
                                   " %s, cannot migrate" % (target, port))
415 416

  
......
549 550
      hv_base.ParamInSet(True, constants.HT_HVM_VALID_NIC_TYPES),
550 551
    constants.HV_PAE: hv_base.NO_CHECK,
551 552
    constants.HV_VNC_BIND_ADDRESS:
552
      (False, utils.IsValidIP4,
553
      (False, netutils.IsValidIP4,
553 554
       "VNC bind address is not a valid IP address", None, None),
554 555
    constants.HV_KERNEL_PATH: hv_base.REQ_FILE_CHECK,
555 556
    constants.HV_DEVICE_MODEL: hv_base.REQ_FILE_CHECK,

Also available in: Unified diff