Revision cc130cc7 lib/constants.py

b/lib/constants.py
604 604
# HV parameter names (global namespace)
605 605
HV_BOOT_ORDER = "boot_order"
606 606
HV_CDROM_IMAGE_PATH = "cdrom_image_path"
607
HV_KVM_CDROM2_IMAGE_PATH = "cdrom2_image_path"
608
HV_KVM_FLOPPY_IMAGE_PATH = "floppy_image_path"
607 609
HV_NIC_TYPE = "nic_type"
608 610
HV_DISK_TYPE = "disk_type"
611
HV_KVM_CDROM_DISK_TYPE = "cdrom_disk_type"
609 612
HV_VNC_BIND_ADDRESS = "vnc_bind_address"
610 613
HV_VNC_PASSWORD_FILE = "vnc_password_file"
611 614
HV_VNC_TLS = "vnc_tls"
......
641 644

  
642 645
HVS_PARAMETER_TYPES = {
643 646
  HV_BOOT_ORDER: VTYPE_STRING,
647
  HV_KVM_FLOPPY_IMAGE_PATH: VTYPE_STRING,
644 648
  HV_CDROM_IMAGE_PATH: VTYPE_STRING,
649
  HV_KVM_CDROM2_IMAGE_PATH: VTYPE_STRING,
645 650
  HV_NIC_TYPE: VTYPE_STRING,
646 651
  HV_DISK_TYPE: VTYPE_STRING,
652
  HV_KVM_CDROM_DISK_TYPE: VTYPE_STRING,
647 653
  HV_VNC_PASSWORD_FILE: VTYPE_STRING,
648 654
  HV_VNC_BIND_ADDRESS: VTYPE_STRING,
649 655
  HV_VNC_TLS: VTYPE_BOOL,
......
845 851
HT_KVM_VALID_MOUSE_TYPES = frozenset([HT_MOUSE_MOUSE, HT_MOUSE_TABLET])
846 852

  
847 853
# Boot order
854
HT_BO_FLOPPY = "floppy"
848 855
HT_BO_CDROM = "cdrom"
849 856
HT_BO_DISK = "disk"
850 857
HT_BO_NETWORK = "network"
851 858

  
852
HT_KVM_VALID_BO_TYPES = frozenset([HT_BO_CDROM, HT_BO_DISK, HT_BO_NETWORK])
859
HT_KVM_VALID_BO_TYPES = frozenset([HT_BO_FLOPPY, HT_BO_CDROM,
860
                                   HT_BO_DISK, HT_BO_NETWORK])
853 861

  
854 862
# Security models
855 863
HT_SM_NONE = "none"
......
1177 1185
    HV_VNC_X509: '',
1178 1186
    HV_VNC_X509_VERIFY: False,
1179 1187
    HV_VNC_PASSWORD_FILE: '',
1188
    HV_KVM_FLOPPY_IMAGE_PATH: '',
1180 1189
    HV_CDROM_IMAGE_PATH: '',
1190
    HV_KVM_CDROM2_IMAGE_PATH: '',
1181 1191
    HV_BOOT_ORDER: HT_BO_DISK,
1182 1192
    HV_NIC_TYPE: HT_NIC_PARAVIRTUAL,
1183 1193
    HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
1194
    HV_KVM_CDROM_DISK_TYPE: '',
1184 1195
    HV_USB_MOUSE: '',
1185 1196
    HV_MIGRATION_PORT: 8102,
1186 1197
    HV_MIGRATION_BANDWIDTH: 32, # MiB/s

Also available in: Unified diff