Revision e2d14329

b/lib/hypervisor/hv_base.py
72 72
                   "CPU mask definition is not well-formed",
73 73
                   None, None)
74 74

  
75
# Check for validity of port number
76
_NET_PORT_CHECK = (lambda x: 0 < x < 65535, "invalid port number",
77
                   None, None)
78

  
75 79
# nice wrappers for users
76 80
REQ_FILE_CHECK = (True, ) + _FILE_CHECK
77 81
OPT_FILE_CHECK = (False, ) + _FILE_CHECK
78 82
REQ_DIR_CHECK = (True, ) + _DIR_CHECK
79 83
OPT_DIR_CHECK = (False, ) + _DIR_CHECK
80
NET_PORT_CHECK = (True, lambda x: x > 0 and x < 65535, "invalid port number",
81
                  None, None)
82
OPT_CPU_MASK_CHECK = (False, ) + _CPU_MASK_CHECK
84
REQ_NET_PORT_CHECK = (True, ) + _NET_PORT_CHECK
85
OPT_NET_PORT_CHECK = (False, ) + _NET_PORT_CHECK
83 86
REQ_CPU_MASK_CHECK = (True, ) + _CPU_MASK_CHECK
87
OPT_CPU_MASK_CHECK = (False, ) + _CPU_MASK_CHECK
84 88

  
85 89
# no checks at all
86 90
NO_CHECK = (False, None, None, None, None)
b/lib/hypervisor/hv_kvm.py
179 179
    constants.HV_USB_MOUSE:
180 180
      hv_base.ParamInSet(False, constants.HT_KVM_VALID_MOUSE_TYPES),
181 181
    constants.HV_KEYMAP: hv_base.NO_CHECK,
182
    constants.HV_MIGRATION_PORT: hv_base.NET_PORT_CHECK,
182
    constants.HV_MIGRATION_PORT: hv_base.REQ_NET_PORT_CHECK,
183 183
    constants.HV_MIGRATION_BANDWIDTH: hv_base.NO_CHECK,
184 184
    constants.HV_MIGRATION_DOWNTIME: hv_base.NO_CHECK,
185 185
    constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
b/lib/hypervisor/hv_xen.py
466 466
    constants.HV_INITRD_PATH: hv_base.OPT_FILE_CHECK,
467 467
    constants.HV_ROOT_PATH: hv_base.NO_CHECK,
468 468
    constants.HV_KERNEL_ARGS: hv_base.NO_CHECK,
469
    constants.HV_MIGRATION_PORT: hv_base.NET_PORT_CHECK,
469
    constants.HV_MIGRATION_PORT: hv_base.REQ_NET_PORT_CHECK,
470 470
    constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
471 471
    # TODO: Add a check for the blockdev prefix (matching [a-z:] or similar).
472 472
    constants.HV_BLOCKDEV_PREFIX: hv_base.NO_CHECK,
......
574 574
    constants.HV_KERNEL_PATH: hv_base.REQ_FILE_CHECK,
575 575
    constants.HV_DEVICE_MODEL: hv_base.REQ_FILE_CHECK,
576 576
    constants.HV_VNC_PASSWORD_FILE: hv_base.REQ_FILE_CHECK,
577
    constants.HV_MIGRATION_PORT: hv_base.NET_PORT_CHECK,
577
    constants.HV_MIGRATION_PORT: hv_base.REQ_NET_PORT_CHECK,
578 578
    constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
579 579
    constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
580 580
    # TODO: Add a check for the blockdev prefix (matching [a-z:] or similar).

Also available in: Unified diff