Revision 783a6c0b lib/constants.py

b/lib/constants.py
546 546
HV_MIGRATION_PORT = "migration_port"
547 547
HV_MIGRATION_BANDWIDTH = "migration_bandwidth"
548 548
HV_MIGRATION_DOWNTIME = "migration_downtime"
549
HV_MIGRATION_TYPE = "migration_type"
549
HV_MIGRATION_MODE = "migration_mode"
550 550
HV_USE_LOCALTIME = "use_localtime"
551 551
HV_DISK_CACHE = "disk_cache"
552 552
HV_SECURITY_MODEL = "security_model"
......
582 582
  HV_MIGRATION_PORT: VTYPE_INT,
583 583
  HV_MIGRATION_BANDWIDTH: VTYPE_INT,
584 584
  HV_MIGRATION_DOWNTIME: VTYPE_INT,
585
  HV_MIGRATION_TYPE: VTYPE_STRING,
585
  HV_MIGRATION_MODE: VTYPE_STRING,
586 586
  HV_USE_LOCALTIME: VTYPE_BOOL,
587 587
  HV_DISK_CACHE: VTYPE_STRING,
588 588
  HV_SECURITY_MODEL: VTYPE_STRING,
......
733 733
# Migration type
734 734
HT_MIGRATION_LIVE = "live"
735 735
HT_MIGRATION_NONLIVE = "non-live"
736
HT_MIGRATION_TYPES = frozenset([HT_MIGRATION_LIVE, HT_MIGRATION_NONLIVE])
736
HT_MIGRATION_MODES = frozenset([HT_MIGRATION_LIVE, HT_MIGRATION_NONLIVE])
737 737

  
738 738
# Cluster Verify steps
739 739
VERIFY_NPLUSONE_MEM = 'nplusone_mem'
......
877 877
    HV_ROOT_PATH: '/dev/sda1',
878 878
    HV_KERNEL_ARGS: 'ro',
879 879
    HV_MIGRATION_PORT: 8002,
880
    HV_MIGRATION_TYPE: HT_MIGRATION_LIVE,
880
    HV_MIGRATION_MODE: HT_MIGRATION_LIVE,
881 881
    },
882 882
  HT_XEN_HVM: {
883 883
    HV_BOOT_ORDER: "cd",
......
891 891
    HV_KERNEL_PATH: "/usr/lib/xen/boot/hvmloader",
892 892
    HV_DEVICE_MODEL: "/usr/lib/xen/bin/qemu-dm",
893 893
    HV_MIGRATION_PORT: 8002,
894
    HV_MIGRATION_TYPE: HT_MIGRATION_NONLIVE,
894
    HV_MIGRATION_MODE: HT_MIGRATION_NONLIVE,
895 895
    HV_USE_LOCALTIME: False,
896 896
    },
897 897
  HT_KVM: {
......
914 914
    HV_MIGRATION_PORT: 8102,
915 915
    HV_MIGRATION_BANDWIDTH: 32, # MiB/s
916 916
    HV_MIGRATION_DOWNTIME: 30,  # ms
917
    HV_MIGRATION_TYPE: HT_MIGRATION_LIVE,
917
    HV_MIGRATION_MODE: HT_MIGRATION_LIVE,
918 918
    HV_USE_LOCALTIME: False,
919 919
    HV_DISK_CACHE: HT_CACHE_DEFAULT,
920 920
    HV_SECURITY_MODEL: HT_SM_NONE,
......
936 936
HVC_GLOBALS = frozenset([
937 937
  HV_MIGRATION_PORT,
938 938
  HV_MIGRATION_BANDWIDTH,
939
  HV_MIGRATION_TYPE,
939
  HV_MIGRATION_MODE,
940 940
  ])
941 941

  
942 942
BEC_DEFAULTS = {

Also available in: Unified diff