X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/30948aa6bf7d6a5fc214d54d9d050bd63b47496d..c9d443ea4ab1a6c031306afe95f5e9e92d61d693:/lib/constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 0b43a12..abfb1ea 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -292,6 +292,7 @@ HV_KERNEL_PATH = "kernel_path"
 HV_INITRD_PATH = "initrd_path"
 HV_ROOT_PATH = "root_path"
 HV_SERIAL_CONSOLE = "serial_console"
+HV_USB_MOUSE = "usb_mouse"
 
 HVS_PARAMETERS = frozenset([
   HV_BOOT_ORDER,
@@ -308,6 +309,7 @@ HVS_PARAMETERS = frozenset([
   HV_INITRD_PATH,
   HV_ROOT_PATH,
   HV_SERIAL_CONSOLE,
+  HV_USB_MOUSE,
   ])
 
 # BE parameter names
@@ -333,20 +335,38 @@ HYPER_TYPES = frozenset([HT_XEN_PVM, HT_FAKE, HT_XEN_HVM, HT_KVM])
 HTS_REQ_PORT = frozenset([HT_XEN_HVM, HT_KVM])
 HTS_USE_VNC = frozenset([HT_XEN_HVM, HT_KVM])
 
-HT_HVM_VNC_BASE_PORT = 5900
+VNC_BASE_PORT = 5900
 VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
 VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
 
-# HVM NIC types
-HT_HVM_NIC_RTL8139 = "rtl8139"
-HT_HVM_NIC_NE2K_PCI = "ne2k_pci"
-HT_HVM_NIC_NE2K_ISA = "ne2k_isa"
-HT_HVM_DEV_PARAVIRTUAL = "paravirtual"
-HT_HVM_DEV_IOEMU = "ioemu"
-HT_HVM_VALID_NIC_TYPES = frozenset([HT_HVM_NIC_RTL8139, HT_HVM_NIC_NE2K_PCI,
-                                    HT_HVM_NIC_NE2K_ISA,
-                                    HT_HVM_DEV_PARAVIRTUAL])
-HT_HVM_VALID_DISK_TYPES = frozenset([HT_HVM_DEV_PARAVIRTUAL, HT_HVM_DEV_IOEMU])
+# Device types
+HT_NIC_RTL8139 = "rtl8139"
+HT_NIC_NE2K_PCI = "ne2k_pci"
+HT_NIC_NE2K_ISA = "ne2k_isa"
+HT_NIC_I82551 = "i82551"
+HT_NIC_I85557B = "i82557b"
+HT_NIC_I8259ER = "i82559er"
+HT_NIC_PCNET = "pcnet"
+HT_NIC_E1000 = "e1000"
+HT_NIC_PARAVIRTUAL = HT_DISK_PARAVIRTUAL = "paravirtual"
+HT_DISK_IOEMU = "ioemu"
+HT_DISK_IDE = "ide"
+HT_DISK_SCSI = "scsi"
+HT_DISK_SD = "sd"
+HT_DISK_MTD = "mtd"
+HT_DISK_PFLASH = "pflash"
+
+HT_HVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI,
+                                    HT_NIC_NE2K_ISA, HT_NIC_PARAVIRTUAL])
+HT_HVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IOEMU])
+HT_KVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI,
+                                    HT_NIC_NE2K_ISA, HT_NIC_I82551,
+                                    HT_NIC_I85557B, HT_NIC_I8259ER,
+                                    HT_NIC_PCNET, HT_NIC_E1000,
+                                    HT_NIC_PARAVIRTUAL])
+HT_KVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IDE,
+                                     HT_DISK_SCSI, HT_DISK_SD, HT_DISK_MTD,
+                                     HT_DISK_PFLASH])
 
 # Cluster Verify steps
 VERIFY_NPLUSONE_MEM = 'nplusone_mem'
@@ -443,8 +463,8 @@ HVC_DEFAULTS = {
   HT_XEN_HVM: {
     HV_BOOT_ORDER: "cd",
     HV_CDROM_IMAGE_PATH: None,
-    HV_NIC_TYPE: HT_HVM_NIC_RTL8139,
-    HV_DISK_TYPE: HT_HVM_DEV_PARAVIRTUAL,
+    HV_NIC_TYPE: HT_NIC_RTL8139,
+    HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
     HV_VNC_BIND_ADDRESS: '0.0.0.0',
     HV_ACPI: True,
     HV_PAE: True,
@@ -459,6 +479,11 @@ HVC_DEFAULTS = {
     HV_VNC_TLS: False,
     HV_VNC_X509: '',
     HV_VNC_X509_VERIFY: False,
+    HV_CDROM_IMAGE_PATH: None,
+    HV_BOOT_ORDER: "disk",
+    HV_NIC_TYPE: HT_NIC_PARAVIRTUAL,
+    HV_DISK_TYPE: HT_DISK_PARAVIRTUAL,
+    HV_USB_MOUSE: None,
     },
   HT_FAKE: {
     },