Hs2Py constants: add RPC timeout constants
[ganeti-local] / lib / constants.py
index eefc250..8319124 100644 (file)
 import re
 import socket
 
-from ganeti import _autoconf
+from ganeti import _constants
 from ganeti import _vcsversion
 from ganeti import compat
 from ganeti import pathutils
 
 
 # various versions
-RELEASE_VERSION = _autoconf.PACKAGE_VERSION
-OS_API_V10 = 10
-OS_API_V15 = 15
-OS_API_V20 = 20
-OS_API_VERSIONS = compat.UniqueFrozenset([
-  OS_API_V10,
-  OS_API_V15,
-  OS_API_V20,
-  ])
+RELEASE_VERSION = _constants.RELEASE_VERSION
+OS_API_V10 = _constants.OS_API_V10
+OS_API_V15 = _constants.OS_API_V15
+OS_API_V20 = _constants.OS_API_V20
+OS_API_VERSIONS = _constants.OS_API_VERSIONS
 VCS_VERSION = _vcsversion.VCS_VERSION
 EXPORT_VERSION = 0
 RAPI_VERSION = 2
 
+VERSION_MAJOR = _constants.VERSION_MAJOR
+VERSION_MINOR = _constants.VERSION_MINOR
+VERSION_REVISION = _constants.VERSION_REVISION
 
-# Format for CONFIG_VERSION:
-#   01 03 0123 = 01030123
-#   ^^ ^^ ^^^^
-#   |  |  + Configuration version/revision
-#   |  + Minor version
-#   + Major version
-#
-# It is stored as an integer. Make sure not to write an octal number.
-
-# BuildVersion and SplitVersion must be in here because we can't import other
-# modules. The cfgupgrade tool must be able to read and write version numbers
-# and thus requires these functions. To avoid code duplication, they're kept in
-# here.
-
-def BuildVersion(major, minor, revision):
-  """Calculates int version number from major, minor and revision numbers.
-
-  Returns: int representing version number
-
-  """
-  assert isinstance(major, int)
-  assert isinstance(minor, int)
-  assert isinstance(revision, int)
-  return (1000000 * major +
-            10000 * minor +
-                1 * revision)
-
-
-def SplitVersion(version):
-  """Splits version number stored in an int.
+DIR_VERSION = _constants.DIR_VERSION
 
-  Returns: tuple; (major, minor, revision)
-
-  """
-  assert isinstance(version, int)
-
-  (major, remainder) = divmod(version, 1000000)
-  (minor, revision) = divmod(remainder, 10000)
-
-  return (major, minor, revision)
-
-
-CONFIG_MAJOR = int(_autoconf.VERSION_MAJOR)
-CONFIG_MINOR = int(_autoconf.VERSION_MINOR)
-CONFIG_REVISION = 0
-CONFIG_VERSION = BuildVersion(CONFIG_MAJOR, CONFIG_MINOR, CONFIG_REVISION)
+CONFIG_MAJOR = _constants.CONFIG_MAJOR
+CONFIG_MINOR = _constants.CONFIG_MINOR
+CONFIG_REVISION = _constants.CONFIG_REVISION
+CONFIG_VERSION = _constants.CONFIG_VERSION
 
 #: RPC protocol version
-PROTOCOL_VERSION = BuildVersion(CONFIG_MAJOR, CONFIG_MINOR, 0)
+PROTOCOL_VERSION = _constants.PROTOCOL_VERSION
 
 # user separation
-DAEMONS_GROUP = _autoconf.DAEMONS_GROUP
-ADMIN_GROUP = _autoconf.ADMIN_GROUP
-MASTERD_USER = _autoconf.MASTERD_USER
-MASTERD_GROUP = _autoconf.MASTERD_GROUP
-RAPI_USER = _autoconf.RAPI_USER
-RAPI_GROUP = _autoconf.RAPI_GROUP
-CONFD_USER = _autoconf.CONFD_USER
-CONFD_GROUP = _autoconf.CONFD_GROUP
-LUXID_USER = _autoconf.LUXID_USER
-LUXID_GROUP = _autoconf.LUXID_GROUP
-NODED_USER = _autoconf.NODED_USER
-NODED_GROUP = _autoconf.NODED_GROUP
-MOND_USER = _autoconf.MOND_USER
-MOND_GROUP = _autoconf.MOND_GROUP
-SSH_LOGIN_USER = _autoconf.SSH_LOGIN_USER
-SSH_CONSOLE_USER = _autoconf.SSH_CONSOLE_USER
+DAEMONS_GROUP = _constants.DAEMONS_GROUP
+ADMIN_GROUP = _constants.ADMIN_GROUP
+MASTERD_USER = _constants.MASTERD_USER
+MASTERD_GROUP = _constants.MASTERD_GROUP
+RAPI_USER = _constants.RAPI_USER
+RAPI_GROUP = _constants.RAPI_GROUP
+CONFD_USER = _constants.CONFD_USER
+CONFD_GROUP = _constants.CONFD_GROUP
+LUXID_USER = _constants.LUXID_USER
+LUXID_GROUP = _constants.LUXID_GROUP
+NODED_USER = _constants.NODED_USER
+NODED_GROUP = _constants.NODED_GROUP
+MOND_USER = _constants.MOND_USER
+MOND_GROUP = _constants.MOND_GROUP
+SSH_LOGIN_USER = _constants.SSH_LOGIN_USER
+SSH_CONSOLE_USER = _constants.SSH_CONSOLE_USER
 
 # cpu pinning separators and constants
 CPU_PINNING_SEP = ":"
@@ -137,66 +96,43 @@ CPU_PINNING_ALL_XEN = "0-63"
 CPU_PINNING_ALL_KVM = 0xFFFFFFFF
 
 # Wipe
-DD_CMD = "dd"
-MAX_WIPE_CHUNK = 1024 # 1GB
-MIN_WIPE_CHUNK_PERCENT = 10
-
-RUN_DIRS_MODE = 0775
-SECURE_DIR_MODE = 0700
-SECURE_FILE_MODE = 0600
-ADOPTABLE_BLOCKDEV_ROOT = "/dev/disk/"
-ENABLE_FILE_STORAGE = _autoconf.ENABLE_FILE_STORAGE
-ENABLE_SHARED_FILE_STORAGE = _autoconf.ENABLE_SHARED_FILE_STORAGE
-ENABLE_CONFD = _autoconf.ENABLE_CONFD
-ENABLE_MOND = _autoconf.ENABLE_MOND
-ENABLE_SPLIT_QUERY = _autoconf.ENABLE_SPLIT_QUERY
-ENABLE_RESTRICTED_COMMANDS = _autoconf.ENABLE_RESTRICTED_COMMANDS
+DD_CMD = _constants.DD_CMD
+MAX_WIPE_CHUNK = _constants.MAX_WIPE_CHUNK
+MIN_WIPE_CHUNK_PERCENT = _constants.MIN_WIPE_CHUNK_PERCENT
+
+RUN_DIRS_MODE = _constants.RUN_DIRS_MODE
+SECURE_DIR_MODE = _constants.SECURE_DIR_MODE
+SECURE_FILE_MODE = _constants.SECURE_FILE_MODE
+ADOPTABLE_BLOCKDEV_ROOT = _constants.ADOPTABLE_BLOCKDEV_ROOT
+ENABLE_CONFD = _constants.ENABLE_CONFD
+ENABLE_MOND = _constants.ENABLE_MOND
+ENABLE_SPLIT_QUERY = _constants.ENABLE_SPLIT_QUERY
+ENABLE_RESTRICTED_COMMANDS = _constants.ENABLE_RESTRICTED_COMMANDS
 
 # SSH constants
-SSH = "ssh"
-SCP = "scp"
-
-NODED = "ganeti-noded"
-CONFD = "ganeti-confd"
-LUXID = "ganeti-luxid"
-RAPI = "ganeti-rapi"
-MASTERD = "ganeti-masterd"
-MOND = "ganeti-mond"
-
-DAEMONS = compat.UniqueFrozenset([
-  NODED,
-  CONFD,
-  LUXID,
-  RAPI,
-  MASTERD,
-  MOND,
-  ])
+SSH = _constants.SSH
+SCP = _constants.SCP
 
-DAEMONS_PORTS = {
-  # daemon-name: ("proto", "default-port")
-  NODED: ("tcp", 1811),
-  CONFD: ("udp", 1814),
-  MOND: ("tcp", 1815),
-  RAPI: ("tcp", 5080),
-  SSH: ("tcp", 22),
-}
+NODED = _constants.NODED
+CONFD = _constants.CONFD
+LUXID = _constants.LUXID
+RAPI = _constants.RAPI
+MASTERD = _constants.MASTERD
+MOND = _constants.MOND
 
-DEFAULT_NODED_PORT = DAEMONS_PORTS[NODED][1]
-DEFAULT_CONFD_PORT = DAEMONS_PORTS[CONFD][1]
-DEFAULT_MOND_PORT = DAEMONS_PORTS[MOND][1]
-DEFAULT_RAPI_PORT = DAEMONS_PORTS[RAPI][1]
-
-FIRST_DRBD_PORT = 11000
-LAST_DRBD_PORT = 14999
-
-DAEMONS_LOGBASE = {
-  NODED: "node-daemon",
-  CONFD: "conf-daemon",
-  LUXID: "luxi-daemon",
-  RAPI: "rapi-daemon",
-  MASTERD: "master-daemon",
-  MOND: "monitoring-daemon",
-  }
+DAEMONS = _constants.DAEMONS
+
+DAEMONS_PORTS = _constants.DAEMONS_PORTS
+
+DEFAULT_NODED_PORT = _constants.DEFAULT_NODED_PORT
+DEFAULT_CONFD_PORT = _constants.DEFAULT_CONFD_PORT
+DEFAULT_MOND_PORT = _constants.DEFAULT_MOND_PORT
+DEFAULT_RAPI_PORT = _constants.DEFAULT_RAPI_PORT
+
+FIRST_DRBD_PORT = _constants.FIRST_DRBD_PORT
+LAST_DRBD_PORT = _constants.LAST_DRBD_PORT
+
+DAEMONS_LOGBASE = _constants.DAEMONS_LOGBASE
 
 DAEMONS_LOGFILES = \
     dict((daemon, pathutils.GetLogFilename(DAEMONS_LOGBASE[daemon]))
@@ -218,8 +154,8 @@ VALID_EXTRA_LOGREASONS = compat.UniqueFrozenset([
 # These are the extra logfiles, grouped by daemon
 DAEMONS_EXTRA_LOGBASE = {
   MOND: {
-    EXTRA_LOGREASON_ACCESS: "monitoring-daemon-access",
-    EXTRA_LOGREASON_ERROR: "monitoring-daemon-error",
+    EXTRA_LOGREASON_ACCESS: _constants.EXTRA_LOGREASON_ACCESS,
+    EXTRA_LOGREASON_ERROR: _constants.EXTRA_LOGREASON_ERROR,
     }
   }
 
@@ -229,12 +165,12 @@ DAEMONS_EXTRA_LOGFILES = \
        for extra in DAEMONS_EXTRA_LOGBASE[daemon]))
          for daemon in DAEMONS_EXTRA_LOGBASE)
 
-DEV_CONSOLE = "/dev/console"
+DEV_CONSOLE = _constants.DEV_CONSOLE
 
 PROC_MOUNTS = "/proc/mounts"
 
 # Local UniX Interface related constants
-LUXI_EOM = "\3"
+LUXI_EOM = chr(3)
 LUXI_VERSION = CONFIG_VERSION
 #: Environment variable for the luxi override socket
 LUXI_OVERRIDE = "FORCE_LUXI_SOCKET"
@@ -242,26 +178,20 @@ LUXI_OVERRIDE_MASTER = "master"
 LUXI_OVERRIDE_QUERY = "query"
 
 # one of "no", "yes", "only"
-SYSLOG_USAGE = _autoconf.SYSLOG_USAGE
-SYSLOG_NO = "no"
-SYSLOG_YES = "yes"
-SYSLOG_ONLY = "only"
-SYSLOG_SOCKET = "/dev/log"
+SYSLOG_USAGE = _constants.SYSLOG_USAGE
+SYSLOG_NO = _constants.SYSLOG_NO
+SYSLOG_YES = _constants.SYSLOG_YES
+SYSLOG_ONLY = _constants.SYSLOG_ONLY
+SYSLOG_SOCKET = _constants.SYSLOG_SOCKET
 
 EXPORT_CONF_FILE = "config.ini"
 
-XEN_BOOTLOADER = _autoconf.XEN_BOOTLOADER
-XEN_KERNEL = _autoconf.XEN_KERNEL
-XEN_INITRD = _autoconf.XEN_INITRD
-XEN_CMD_XM = "xm"
-XEN_CMD_XL = "xl"
-# FIXME: This will be made configurable using hvparams in Ganeti 2.7
-XEN_CMD = _autoconf.XEN_CMD
-
-KNOWN_XEN_COMMANDS = compat.UniqueFrozenset([
-  XEN_CMD_XM,
-  XEN_CMD_XL,
-  ])
+XEN_BOOTLOADER = _constants.XEN_BOOTLOADER
+XEN_KERNEL = _constants.XEN_KERNEL
+XEN_INITRD = _constants.XEN_INITRD
+XEN_CMD_XM = _constants.XEN_CMD_XM
+XEN_CMD_XL = _constants.XEN_CMD_XL
+KNOWN_XEN_COMMANDS = _constants.KNOWN_XEN_COMMANDS
 
 # When the Xen toolstack used is "xl", live migration requires the source host
 # to connect to the target host via ssh (xl runs this command). We need to pass
@@ -274,11 +204,11 @@ XL_SSH_CMD = ("ssh -l %s -oGlobalKnownHostsFile=%s"
               " -oHostKeyAlias=%%s") % (SSH_LOGIN_USER,
                                         pathutils.SSH_KNOWN_HOSTS_FILE)
 
-KVM_PATH = _autoconf.KVM_PATH
-KVM_KERNEL = _autoconf.KVM_KERNEL
-SOCAT_PATH = _autoconf.SOCAT_PATH
-SOCAT_USE_ESCAPE = _autoconf.SOCAT_USE_ESCAPE
-SOCAT_USE_COMPRESS = _autoconf.SOCAT_USE_COMPRESS
+KVM_PATH = _constants.KVM_PATH
+KVM_KERNEL = _constants.KVM_KERNEL
+SOCAT_PATH = _constants.SOCAT_PATH
+SOCAT_USE_ESCAPE = _constants.SOCAT_USE_ESCAPE
+SOCAT_USE_COMPRESS = _constants.SOCAT_USE_COMPRESS
 SOCAT_ESCAPE_CODE = "0x1d"
 
 #: Console as SSH command
@@ -355,6 +285,8 @@ VALUE_GENERATE = "generate"
 VALUE_NONE = "none"
 VALUE_TRUE = "true"
 VALUE_FALSE = "false"
+VALUE_HS_NOTHING = {"Nothing": None}
+
 
 # External script validation mask
 EXT_PLUGIN_MASK = re.compile("^[a-zA-Z0-9_-]+$")
@@ -379,40 +311,36 @@ HKR_FAIL = 1
 HKR_SUCCESS = 2
 
 # Storage types
-ST_BLOCK = "blockdev"
-ST_DISKLESS = "diskless"
-ST_EXT = "ext"
-ST_FILE = "file"
-ST_LVM_PV = "lvm-pv"
-ST_LVM_VG = "lvm-vg"
-ST_RADOS = "rados"
-
-VALID_STORAGE_TYPES = compat.UniqueFrozenset([
-  ST_BLOCK,
-  ST_DISKLESS,
-  ST_EXT,
-  ST_FILE,
-  ST_LVM_PV,
-  ST_LVM_VG,
-  ST_RADOS,
-  ])
+ST_BLOCK = _constants.ST_BLOCK
+ST_DISKLESS = _constants.ST_DISKLESS
+ST_EXT = _constants.ST_EXT
+ST_FILE = _constants.ST_FILE
+ST_LVM_PV = _constants.ST_LVM_PV
+ST_LVM_VG = _constants.ST_LVM_VG
+ST_RADOS = _constants.ST_RADOS
+STORAGE_TYPES = _constants.STORAGE_TYPES
+
+# the set of storage types for which storage reporting is available
+# FIXME: Remove this, once storage reporting is available for all types.
+STS_REPORT = compat.UniqueFrozenset([ST_FILE, ST_LVM_PV, ST_LVM_VG])
 
 # Storage fields
 # first two are valid in LU context only, not passed to backend
-SF_NODE = "node"
-SF_TYPE = "type"
+SF_NODE = _constants.SF_NODE
+SF_TYPE = _constants.SF_TYPE
 # and the rest are valid in backend
-SF_NAME = "name"
-SF_SIZE = "size"
-SF_FREE = "free"
-SF_USED = "used"
-SF_ALLOCATABLE = "allocatable"
+SF_NAME = _constants.SF_NAME
+SF_SIZE = _constants.SF_SIZE
+SF_FREE = _constants.SF_FREE
+SF_USED = _constants.SF_USED
+SF_ALLOCATABLE = _constants.SF_ALLOCATABLE
 
 # Storage operations
 SO_FIX_CONSISTENCY = "fix-consistency"
 
 # Available fields per storage type
 VALID_STORAGE_FIELDS = compat.UniqueFrozenset([
+  SF_NODE,
   SF_NAME,
   SF_TYPE,
   SF_SIZE,
@@ -429,56 +357,42 @@ VALID_STORAGE_OPERATIONS = {
   ST_LVM_VG: frozenset([SO_FIX_CONSISTENCY]),
   }
 
+# Volume fields
+VF_DEV = "dev"
+VF_INSTANCE = "instance"
+VF_NAME = "name"
+VF_NODE = "node"
+VF_PHYS = "phys"
+VF_SIZE = "size"
+VF_VG = "vg"
+
 # Local disk status
 # Note: Code depends on LDS_OKAY < LDS_UNKNOWN < LDS_FAULTY
 (LDS_OKAY,
  LDS_UNKNOWN,
  LDS_FAULTY) = range(1, 4)
 
-# disk template types
-DT_BLOCK = "blockdev"
-DT_DISKLESS = "diskless"
-DT_DRBD8 = "drbd"
-DT_EXT = "ext"
-DT_FILE = "file"
-DT_PLAIN = "plain"
-DT_RBD = "rbd"
-DT_SHARED_FILE = "sharedfile"
-
-# This is used to order determine the default disk template when the list
-# of enabled disk templates is inferred from the current state of the cluster.
-# This only happens on an upgrade from a version of Ganeti that did not
-# support the 'enabled_disk_templates' so far.
-DISK_TEMPLATE_PREFERENCE = [
-  DT_DRBD8,
-  DT_PLAIN,
-  DT_FILE,
-  DT_SHARED_FILE,
-  DT_RBD,
-  DT_BLOCK,
-  DT_DISKLESS,
-  DT_EXT
-  ]
-
-DISK_TEMPLATES = compat.UniqueFrozenset([
-  DT_DISKLESS,
-  DT_PLAIN,
-  DT_DRBD8,
-  DT_FILE,
-  DT_SHARED_FILE,
-  DT_BLOCK,
-  DT_RBD,
-  DT_EXT
-  ])
+LDS_NAMES = {
+  LDS_OKAY: "ok",
+  LDS_UNKNOWN: "unknown",
+  LDS_FAULTY: "faulty",
+}
 
-# disk templates that are enabled by default
-DEFAULT_ENABLED_DISK_TEMPLATES = compat.UniqueFrozenset([
-  DT_DRBD8,
-  DT_PLAIN,
-  ])
+# disk template types
+DT_BLOCK = _constants.DT_BLOCK
+DT_DISKLESS = _constants.DT_DISKLESS
+DT_DRBD8 = _constants.DT_DRBD8
+DT_EXT = _constants.DT_EXT
+DT_FILE = _constants.DT_FILE
+DT_PLAIN = _constants.DT_PLAIN
+DT_RBD = _constants.DT_RBD
+DT_SHARED_FILE = _constants.DT_SHARED_FILE
+DISK_TEMPLATE_PREFERENCE = _constants.DISK_TEMPLATE_PREFERENCE
+DISK_TEMPLATES = _constants.DISK_TEMPLATES
+DEFAULT_ENABLED_DISK_TEMPLATES = _constants.DEFAULT_ENABLED_DISK_TEMPLATES
 
 # mapping of disk templates to storage types
-DISK_TEMPLATES_STORAGE_TYPE = {
+MAP_DISK_TEMPLATE_STORAGE_TYPE = {
   DT_BLOCK: ST_BLOCK,
   DT_DISKLESS: ST_DISKLESS,
   DT_DRBD8: ST_LVM_VG,
@@ -558,33 +472,18 @@ DTS_NO_FREE_SPACE_CHECK = compat.UniqueFrozenset([
   DT_EXT,
   ])
 
-# logical disk types
-LD_LV = "lvm"
-LD_DRBD8 = "drbd8"
-LD_FILE = "file"
-LD_BLOCKDEV = "blockdev"
-LD_RBD = "rbd"
-LD_EXT = "ext"
-LOGICAL_DISK_TYPES = compat.UniqueFrozenset([
-  LD_LV,
-  LD_DRBD8,
-  LD_FILE,
-  LD_BLOCKDEV,
-  LD_RBD,
-  LD_EXT,
-  ])
-
-LDS_BLOCK = compat.UniqueFrozenset([
-  LD_LV,
-  LD_DRBD8,
-  LD_BLOCKDEV,
-  LD_RBD,
-  LD_EXT,
+DTS_BLOCK = compat.UniqueFrozenset([
+  DT_PLAIN,
+  DT_DRBD8,
+  DT_BLOCK,
+  DT_RBD,
+  DT_EXT,
   ])
 
 # drbd constants
 DRBD_HMAC_ALG = "md5"
-DRBD_NET_PROTOCOL = "C"
+DRBD_DEFAULT_NET_PROTOCOL = "C"
+DRBD_MIGRATION_NET_PROTOCOL = "C"
 DRBD_STATUS_FILE = "/proc/drbd"
 
 #: Size of DRBD meta block device
@@ -612,46 +511,36 @@ DRBD_VALID_BARRIER_OPT = compat.UniqueFrozenset([
 RBD_CMD = "rbd"
 
 # file backend driver
-FD_LOOP = "loop"
-FD_BLKTAP = "blktap"
+FD_BLKTAP = _constants.FD_BLKTAP
+FD_LOOP = _constants.FD_LOOP
 
 # the set of drbd-like disk types
-LDS_DRBD = compat.UniqueFrozenset([LD_DRBD8])
+LDS_DRBD = compat.UniqueFrozenset([DT_DRBD8])
 
 # disk access mode
-DISK_RDONLY = "ro"
-DISK_RDWR = "rw"
-DISK_ACCESS_SET = compat.UniqueFrozenset([DISK_RDONLY, DISK_RDWR])
-
-# disk replacement mode
-REPLACE_DISK_PRI = "replace_on_primary"    # replace disks on primary
-REPLACE_DISK_SEC = "replace_on_secondary"  # replace disks on secondary
-REPLACE_DISK_CHG = "replace_new_secondary" # change secondary node
-REPLACE_DISK_AUTO = "replace_auto"
-REPLACE_MODES = compat.UniqueFrozenset([
-  REPLACE_DISK_PRI,
-  REPLACE_DISK_SEC,
-  REPLACE_DISK_CHG,
-  REPLACE_DISK_AUTO,
-  ])
+DISK_RDONLY = _constants.DISK_RDONLY
+DISK_RDWR = _constants.DISK_RDWR
+DISK_ACCESS_SET = _constants.DISK_ACCESS_SET
+DISK_USERSPACE = _constants.DISK_USERSPACE
+DISK_KERNELSPACE = _constants.DISK_KERNELSPACE
+DISK_VALID_ACCESS_MODES = _constants.DISK_VALID_ACCESS_MODES
+
+REPLACE_DISK_PRI = _constants.REPLACE_DISK_PRI
+REPLACE_DISK_SEC = _constants.REPLACE_DISK_SEC
+REPLACE_DISK_CHG = _constants.REPLACE_DISK_CHG
+REPLACE_DISK_AUTO = _constants.REPLACE_DISK_AUTO
+REPLACE_MODES = _constants.REPLACE_MODES
 
 # Instance export mode
-EXPORT_MODE_LOCAL = "local"
-EXPORT_MODE_REMOTE = "remote"
-EXPORT_MODES = compat.UniqueFrozenset([
-  EXPORT_MODE_LOCAL,
-  EXPORT_MODE_REMOTE,
-  ])
+EXPORT_MODE_LOCAL = _constants.EXPORT_MODE_LOCAL
+EXPORT_MODE_REMOTE = _constants.EXPORT_MODE_REMOTE
+EXPORT_MODES = _constants.EXPORT_MODES
 
 # instance creation modes
-INSTANCE_CREATE = "create"
-INSTANCE_IMPORT = "import"
-INSTANCE_REMOTE_IMPORT = "remote-import"
-INSTANCE_CREATE_MODES = compat.UniqueFrozenset([
-  INSTANCE_CREATE,
-  INSTANCE_IMPORT,
-  INSTANCE_REMOTE_IMPORT,
-  ])
+INSTANCE_CREATE = _constants.INSTANCE_CREATE
+INSTANCE_IMPORT = _constants.INSTANCE_IMPORT
+INSTANCE_REMOTE_IMPORT = _constants.INSTANCE_REMOTE_IMPORT
+INSTANCE_CREATE_MODES = _constants.INSTANCE_CREATE_MODES
 
 # Remote import/export handshake message and version
 RIE_VERSION = 0
@@ -682,44 +571,38 @@ INISECT_BEP = "backend"
 INISECT_OSP = "os"
 
 # dynamic device modification
-DDM_ADD = "add"
-DDM_MODIFY = "modify"
-DDM_REMOVE = "remove"
-DDMS_VALUES = compat.UniqueFrozenset([DDM_ADD, DDM_REMOVE])
-DDMS_VALUES_WITH_MODIFY = (DDMS_VALUES | frozenset([
-  DDM_MODIFY,
-  ]))
+DDM_ADD = _constants.DDM_ADD
+DDM_MODIFY = _constants.DDM_MODIFY
+DDM_REMOVE = _constants.DDM_REMOVE
+DDMS_VALUES = _constants.DDMS_VALUES
+DDMS_VALUES_WITH_MODIFY = _constants.DDMS_VALUES_WITH_MODIFY
 # TODO: DDM_SWAP, DDM_MOVE?
 
 # common exit codes
-EXIT_SUCCESS = 0
-EXIT_FAILURE = 1
-EXIT_NOTCLUSTER = 5
-EXIT_NOTMASTER = 11
-EXIT_NODESETUP_ERROR = 12
-EXIT_CONFIRMATION = 13 # need user confirmation
+EXIT_SUCCESS = _constants.EXIT_SUCCESS
+EXIT_FAILURE = _constants.EXIT_FAILURE
+EXIT_NOTCLUSTER = _constants.EXIT_NOTCLUSTER
+EXIT_NOTMASTER = _constants.EXIT_NOTMASTER
+EXIT_NODESETUP_ERROR = _constants.EXIT_NODESETUP_ERROR
+EXIT_CONFIRMATION = _constants.EXIT_CONFIRMATION # need user confirmation
 
 #: Exit code for query operations with unknown fields
-EXIT_UNKNOWN_FIELD = 14
+EXIT_UNKNOWN_FIELD = _constants.EXIT_UNKNOWN_FIELD
 
 # tags
-TAG_CLUSTER = "cluster"
-TAG_NODEGROUP = "nodegroup"
-TAG_NODE = "node"
-TAG_INSTANCE = "instance"
-TAG_NETWORK = "network"
-VALID_TAG_TYPES = compat.UniqueFrozenset([
-  TAG_CLUSTER,
-  TAG_NODEGROUP,
-  TAG_NODE,
-  TAG_INSTANCE,
-  TAG_NETWORK,
-  ])
-MAX_TAG_LEN = 128
-MAX_TAGS_PER_OBJ = 4096
+TAG_CLUSTER = _constants.TAG_CLUSTER
+TAG_NODEGROUP = _constants.TAG_NODEGROUP
+TAG_NODE = _constants.TAG_NODE
+TAG_INSTANCE = _constants.TAG_INSTANCE
+TAG_NETWORK = _constants.TAG_NETWORK
+VALID_TAG_TYPES = _constants.VALID_TAG_TYPES
+
+MAX_TAG_LEN = _constants.MAX_TAG_LEN
+MAX_TAGS_PER_OBJ = _constants.MAX_TAGS_PER_OBJ
 
 # others
 DEFAULT_BRIDGE = "xen-br0"
+DEFAULT_OVS = "switch1"
 CLASSIC_DRBD_SYNC_SPEED = 60 * 1024  # 60 MiB, expressed in KiB
 IP4_ADDRESS_LOCALHOST = "127.0.0.1"
 IP4_ADDRESS_ANY = "0.0.0.0"
@@ -739,12 +622,20 @@ MIN_VG_SIZE = 20480
 DEFAULT_MAC_PREFIX = "aa:00:00"
 # default maximum instance wait time, in seconds.
 DEFAULT_SHUTDOWN_TIMEOUT = 120
-NODE_MAX_CLOCK_SKEW = 150
+NODE_MAX_CLOCK_SKEW = _constants.NODE_MAX_CLOCK_SKEW
 # Time for an intra-cluster disk transfer to wait for a connection
 DISK_TRANSFER_CONNECT_TIMEOUT = 60
 # Disk index separator
-DISK_SEPARATOR = _autoconf.DISK_SEPARATOR
-IP_COMMAND_PATH = _autoconf.IP_PATH
+DISK_SEPARATOR = _constants.DISK_SEPARATOR
+IP_COMMAND_PATH = _constants.IP_COMMAND_PATH
+
+RPC_TMO_URGENT = _constants.RPC_TMO_URGENT
+RPC_TMO_FAST = _constants.RPC_TMO_FAST
+RPC_TMO_NORMAL = _constants.RPC_TMO_NORMAL
+RPC_TMO_SLOW = _constants.RPC_TMO_SLOW
+RPC_TMO_4HRS = _constants.RPC_TMO_4HRS
+RPC_TMO_1DAY = _constants.RPC_TMO_1DAY
+RPC_CONNECT_TIMEOUT = _constants.RPC_CONNECT_TIMEOUT
 
 #: Key for job IDs in opcode result
 JOB_IDS_KEY = "jobs"
@@ -764,17 +655,6 @@ RUNPARTS_STATUS = compat.UniqueFrozenset([
 (RPC_ENCODING_NONE,
  RPC_ENCODING_ZLIB_BASE64) = range(2)
 
-# Various time constants for the timeout table
-RPC_TMO_URGENT = 60 # one minute
-RPC_TMO_FAST = 5 * 60 # five minutes
-RPC_TMO_NORMAL = 15 * 60 # 15 minutes
-RPC_TMO_SLOW = 3600 # one hour
-RPC_TMO_4HRS = 4 * 3600
-RPC_TMO_1DAY = 86400
-
-# Timeout for connecting to nodes (seconds)
-RPC_CONNECT_TIMEOUT = 5
-
 # os related constants
 OS_SCRIPT_CREATE = "create"
 OS_SCRIPT_IMPORT = "import"
@@ -825,15 +705,10 @@ ES_SCRIPTS = frozenset([
 ES_PARAMETERS_FILE = "parameters.list"
 
 # reboot types
-INSTANCE_REBOOT_SOFT = "soft"
-INSTANCE_REBOOT_HARD = "hard"
-INSTANCE_REBOOT_FULL = "full"
-
-REBOOT_TYPES = compat.UniqueFrozenset([
-  INSTANCE_REBOOT_SOFT,
-  INSTANCE_REBOOT_HARD,
-  INSTANCE_REBOOT_FULL,
-  ])
+INSTANCE_REBOOT_SOFT = _constants.INSTANCE_REBOOT_SOFT
+INSTANCE_REBOOT_HARD = _constants.INSTANCE_REBOOT_HARD
+INSTANCE_REBOOT_FULL = _constants.INSTANCE_REBOOT_FULL
+REBOOT_TYPES = _constants.REBOOT_TYPES
 
 # instance reboot behaviors
 INSTANCE_REBOOT_ALLOWED = "reboot"
@@ -844,18 +719,12 @@ REBOOT_BEHAVIORS = compat.UniqueFrozenset([
   INSTANCE_REBOOT_EXIT,
   ])
 
-VTYPE_STRING = "string"
-VTYPE_MAYBE_STRING = "maybe-string"
-VTYPE_BOOL = "bool"
-VTYPE_SIZE = "size" # size, in MiBs
-VTYPE_INT = "int"
-ENFORCEABLE_TYPES = compat.UniqueFrozenset([
-  VTYPE_STRING,
-  VTYPE_MAYBE_STRING,
-  VTYPE_BOOL,
-  VTYPE_SIZE,
-  VTYPE_INT,
-  ])
+VTYPE_STRING = _constants.VTYPE_STRING
+VTYPE_MAYBE_STRING = _constants.VTYPE_MAYBE_STRING
+VTYPE_BOOL = _constants.VTYPE_BOOL
+VTYPE_SIZE = _constants.VTYPE_SIZE
+VTYPE_INT = _constants.VTYPE_INT
+ENFORCEABLE_TYPES = _constants.ENFORCEABLE_TYPES
 
 # Constant representing that the user does not specify any IP version
 IFACE_NO_IP_VERSION_SPECIFIED = 0
@@ -949,6 +818,9 @@ HV_KVM_EXTRA = "kvm_extra"
 HV_KVM_MACHINE_VERSION = "machine_version"
 HV_KVM_PATH = "kvm_path"
 HV_VIF_TYPE = "vif_type"
+HV_VIF_SCRIPT = "vif_script"
+HV_XEN_CMD = "xen_cmd"
+HV_XEN_CPUID = "cpuid"
 HV_VNET_HDR = "vnet_hdr"
 HV_VIRIDIAN = "viridian"
 
@@ -1021,6 +893,9 @@ HVS_PARAMETER_TYPES = {
   HV_KVM_EXTRA: VTYPE_STRING,
   HV_KVM_MACHINE_VERSION: VTYPE_STRING,
   HV_VIF_TYPE: VTYPE_STRING,
+  HV_VIF_SCRIPT: VTYPE_STRING,
+  HV_XEN_CMD: VTYPE_STRING,
+  HV_XEN_CPUID: VTYPE_STRING,
   HV_VNET_HDR: VTYPE_BOOL,
   HV_VIRIDIAN: VTYPE_BOOL,
   }
@@ -1108,7 +983,7 @@ DSS_PARAMETER_TYPES = {
   }
 
 DSS_PARAMETERS = frozenset(DSS_PARAMETER_TYPES.keys())
-DS_VALID_TYPES = compat.UniqueFrozenset([LD_LV])
+DS_VALID_TYPES = compat.UniqueFrozenset([DT_PLAIN])
 
 # Backend parameter names
 BE_MEMORY = "memory" # deprecated and replaced by max and min mem
@@ -1186,11 +1061,17 @@ IPOLICY_ALL_KEYS = (IPOLICY_PARAMETERS |
 ND_OOB_PROGRAM = "oob_program"
 ND_SPINDLE_COUNT = "spindle_count"
 ND_EXCLUSIVE_STORAGE = "exclusive_storage"
+ND_OVS = "ovs"
+ND_OVS_NAME = "ovs_name"
+ND_OVS_LINK = "ovs_link"
 
 NDS_PARAMETER_TYPES = {
   ND_OOB_PROGRAM: VTYPE_STRING,
   ND_SPINDLE_COUNT: VTYPE_INT,
   ND_EXCLUSIVE_STORAGE: VTYPE_BOOL,
+  ND_OVS: VTYPE_BOOL,
+  ND_OVS_NAME: VTYPE_MAYBE_STRING,
+  ND_OVS_LINK: VTYPE_MAYBE_STRING,
   }
 
 NDS_PARAMETERS = frozenset(NDS_PARAMETER_TYPES.keys())
@@ -1199,6 +1080,9 @@ NDS_PARAMETER_TITLES = {
   ND_OOB_PROGRAM: "OutOfBandProgram",
   ND_SPINDLE_COUNT: "SpindleCount",
   ND_EXCLUSIVE_STORAGE: "ExclusiveStorage",
+  ND_OVS: "OpenvSwitch",
+  ND_OVS_NAME: "OpenvSwitchName",
+  ND_OVS_LINK: "OpenvSwitchLink",
   }
 
 # Logical Disks parameters
@@ -1209,6 +1093,7 @@ LDP_NO_META_FLUSH = "disable-meta-flush"
 LDP_DEFAULT_METAVG = "default-metavg"
 LDP_DISK_CUSTOM = "disk-custom"
 LDP_NET_CUSTOM = "net-custom"
+LDP_PROTOCOL = "protocol"
 LDP_DYNAMIC_RESYNC = "dynamic-resync"
 LDP_PLAN_AHEAD = "c-plan-ahead"
 LDP_FILL_TARGET = "c-fill-target"
@@ -1216,6 +1101,7 @@ LDP_DELAY_TARGET = "c-delay-target"
 LDP_MAX_RATE = "c-max-rate"
 LDP_MIN_RATE = "c-min-rate"
 LDP_POOL = "pool"
+LDP_ACCESS = "access"
 DISK_LD_TYPES = {
   LDP_RESYNC_RATE: VTYPE_INT,
   LDP_STRIPES: VTYPE_INT,
@@ -1224,6 +1110,7 @@ DISK_LD_TYPES = {
   LDP_DEFAULT_METAVG: VTYPE_STRING,
   LDP_DISK_CUSTOM: VTYPE_STRING,
   LDP_NET_CUSTOM: VTYPE_STRING,
+  LDP_PROTOCOL: VTYPE_STRING,
   LDP_DYNAMIC_RESYNC: VTYPE_BOOL,
   LDP_PLAN_AHEAD: VTYPE_INT,
   LDP_FILL_TARGET: VTYPE_INT,
@@ -1231,6 +1118,7 @@ DISK_LD_TYPES = {
   LDP_MAX_RATE: VTYPE_INT,
   LDP_MIN_RATE: VTYPE_INT,
   LDP_POOL: VTYPE_STRING,
+  LDP_ACCESS: VTYPE_STRING,
   }
 DISK_LD_PARAMETERS = frozenset(DISK_LD_TYPES.keys())
 
@@ -1244,6 +1132,7 @@ DRBD_META_BARRIERS = "meta-barriers"
 DRBD_DEFAULT_METAVG = "metavg"
 DRBD_DISK_CUSTOM = "disk-custom"
 DRBD_NET_CUSTOM = "net-custom"
+DRBD_PROTOCOL = "protocol"
 DRBD_DYNAMIC_RESYNC = "dynamic-resync"
 DRBD_PLAN_AHEAD = "c-plan-ahead"
 DRBD_FILL_TARGET = "c-fill-target"
@@ -1252,6 +1141,7 @@ DRBD_MAX_RATE = "c-max-rate"
 DRBD_MIN_RATE = "c-min-rate"
 LV_STRIPES = "stripes"
 RBD_POOL = "pool"
+RBD_ACCESS = "access"
 DISK_DT_TYPES = {
   DRBD_RESYNC_RATE: VTYPE_INT,
   DRBD_DATA_STRIPES: VTYPE_INT,
@@ -1261,6 +1151,7 @@ DISK_DT_TYPES = {
   DRBD_DEFAULT_METAVG: VTYPE_STRING,
   DRBD_DISK_CUSTOM: VTYPE_STRING,
   DRBD_NET_CUSTOM: VTYPE_STRING,
+  DRBD_PROTOCOL: VTYPE_STRING,
   DRBD_DYNAMIC_RESYNC: VTYPE_BOOL,
   DRBD_PLAN_AHEAD: VTYPE_INT,
   DRBD_FILL_TARGET: VTYPE_INT,
@@ -1269,59 +1160,50 @@ DISK_DT_TYPES = {
   DRBD_MIN_RATE: VTYPE_INT,
   LV_STRIPES: VTYPE_INT,
   RBD_POOL: VTYPE_STRING,
+  RBD_ACCESS: VTYPE_STRING,
   }
 
 DISK_DT_PARAMETERS = frozenset(DISK_DT_TYPES.keys())
 
-# OOB supported commands
-OOB_POWER_ON = "power-on"
-OOB_POWER_OFF = "power-off"
-OOB_POWER_CYCLE = "power-cycle"
-OOB_POWER_STATUS = "power-status"
-OOB_HEALTH = "health"
-
-OOB_COMMANDS = compat.UniqueFrozenset([
-  OOB_POWER_ON,
-  OOB_POWER_OFF,
-  OOB_POWER_CYCLE,
-  OOB_POWER_STATUS,
-  OOB_HEALTH,
-  ])
+# dynamic disk parameters
+DDP_LOCAL_IP = "local-ip"
+DDP_REMOTE_IP = "remote-ip"
+DDP_PORT = "port"
+DDP_LOCAL_MINOR = "local-minor"
+DDP_REMOTE_MINOR = "remote-minor"
 
-OOB_POWER_STATUS_POWERED = "powered"
+# OOB supported commands
+OOB_POWER_ON = _constants.OOB_POWER_ON
+OOB_POWER_OFF = _constants.OOB_POWER_OFF
+OOB_POWER_CYCLE = _constants.OOB_POWER_CYCLE
+OOB_POWER_STATUS = _constants.OOB_POWER_STATUS
+OOB_HEALTH = _constants.OOB_HEALTH
+OOB_COMMANDS = _constants.OOB_COMMANDS
 
-OOB_TIMEOUT = 60 # 60 seconds
-OOB_POWER_DELAY = 2.0 # 2 seconds
+OOB_POWER_STATUS_POWERED = _constants.OOB_POWER_STATUS_POWERED
 
-OOB_STATUS_OK = "OK"
-OOB_STATUS_WARNING = "WARNING"
-OOB_STATUS_CRITICAL = "CRITICAL"
-OOB_STATUS_UNKNOWN = "UNKNOWN"
+OOB_TIMEOUT = _constants.OOB_TIMEOUT
+OOB_POWER_DELAY = _constants.OOB_POWER_DELAY
 
-OOB_STATUSES = compat.UniqueFrozenset([
-  OOB_STATUS_OK,
-  OOB_STATUS_WARNING,
-  OOB_STATUS_CRITICAL,
-  OOB_STATUS_UNKNOWN,
-  ])
+OOB_STATUS_OK = _constants.OOB_STATUS_OK
+OOB_STATUS_WARNING = _constants.OOB_STATUS_WARNING
+OOB_STATUS_CRITICAL = _constants.OOB_STATUS_CRITICAL
+OOB_STATUS_UNKNOWN = _constants.OOB_STATUS_UNKNOWN
+OOB_STATUSES = _constants.OOB_STATUSES
 
 # Instance Parameters Profile
 PP_DEFAULT = "default"
 
 # NIC_* constants are used inside the ganeti config
-NIC_MODE = "mode"
-NIC_LINK = "link"
-
-NIC_MODE_BRIDGED = "bridged"
-NIC_MODE_ROUTED = "routed"
-NIC_MODE_OVS = "openvswitch"
-NIC_IP_POOL = "pool"
-
-NIC_VALID_MODES = compat.UniqueFrozenset([
-  NIC_MODE_BRIDGED,
-  NIC_MODE_ROUTED,
-  NIC_MODE_OVS,
-  ])
+NIC_MODE = _constants.NIC_MODE
+NIC_LINK = _constants.NIC_LINK
+NIC_VLAN = _constants.NIC_VLAN
+
+NIC_MODE_BRIDGED = _constants.NIC_MODE_BRIDGED
+NIC_MODE_ROUTED = _constants.NIC_MODE_ROUTED
+NIC_MODE_OVS = _constants.NIC_MODE_OVS
+NIC_IP_POOL = _constants.NIC_IP_POOL
+NIC_VALID_MODES = _constants.NIC_VALID_MODES
 
 RESERVE_ACTION = "reserve"
 RELEASE_ACTION = "release"
@@ -1329,12 +1211,14 @@ RELEASE_ACTION = "release"
 NICS_PARAMETER_TYPES = {
   NIC_MODE: VTYPE_STRING,
   NIC_LINK: VTYPE_STRING,
+  NIC_VLAN: VTYPE_MAYBE_STRING,
   }
 
 NICS_PARAMETERS = frozenset(NICS_PARAMETER_TYPES.keys())
 
 # IDISK_* constants are used in opcodes, to create/change disks
 IDISK_SIZE = "size"
+IDISK_SPINDLES = "spindles"
 IDISK_MODE = "mode"
 IDISK_ADOPT = "adopt"
 IDISK_VG = "vg"
@@ -1343,6 +1227,7 @@ IDISK_PROVIDER = "provider"
 IDISK_NAME = "name"
 IDISK_PARAMS_TYPES = {
   IDISK_SIZE: VTYPE_SIZE,
+  IDISK_SPINDLES: VTYPE_INT,
   IDISK_MODE: VTYPE_STRING,
   IDISK_ADOPT: VTYPE_STRING,
   IDISK_VG: VTYPE_STRING,
@@ -1359,6 +1244,8 @@ INIC_MODE = "mode"
 INIC_LINK = "link"
 INIC_NETWORK = "network"
 INIC_NAME = "name"
+INIC_VLAN = "vlan"
+INIC_BRIDGE = "bridge"
 INIC_PARAMS_TYPES = {
   INIC_IP: VTYPE_MAYBE_STRING,
   INIC_LINK: VTYPE_STRING,
@@ -1366,25 +1253,20 @@ INIC_PARAMS_TYPES = {
   INIC_MODE: VTYPE_STRING,
   INIC_NETWORK: VTYPE_MAYBE_STRING,
   INIC_NAME: VTYPE_MAYBE_STRING,
+  INIC_VLAN: VTYPE_MAYBE_STRING,
+  INIC_BRIDGE: VTYPE_MAYBE_STRING
   }
 INIC_PARAMS = frozenset(INIC_PARAMS_TYPES.keys())
 
 # Hypervisor constants
-HT_XEN_PVM = "xen-pvm"
-HT_FAKE = "fake"
-HT_XEN_HVM = "xen-hvm"
-HT_KVM = "kvm"
-HT_CHROOT = "chroot"
-HT_LXC = "lxc"
-HYPER_TYPES = compat.UniqueFrozenset([
-  HT_XEN_PVM,
-  HT_FAKE,
-  HT_XEN_HVM,
-  HT_KVM,
-  HT_CHROOT,
-  HT_LXC,
-  ])
-HTS_REQ_PORT = compat.UniqueFrozenset([HT_XEN_HVM, HT_KVM])
+HT_XEN_PVM = _constants.HT_XEN_PVM
+HT_FAKE = _constants.HT_FAKE
+HT_XEN_HVM = _constants.HT_XEN_HVM
+HT_KVM = _constants.HT_KVM
+HT_CHROOT = _constants.HT_CHROOT
+HT_LXC = _constants.HT_LXC
+HYPER_TYPES = _constants.HYPER_TYPES
+HTS_REQ_PORT = _constants.HTS_REQ_PORT
 
 VNC_BASE_PORT = 5900
 VNC_DEFAULT_BIND_ADDRESS = IP4_ADDRESS_ANY
@@ -1539,150 +1421,74 @@ HT_KVM_DISABLED = "disabled"
 HT_KVM_FLAG_VALUES = compat.UniqueFrozenset([HT_KVM_ENABLED, HT_KVM_DISABLED])
 
 # Migration type
-HT_MIGRATION_LIVE = "live"
-HT_MIGRATION_NONLIVE = "non-live"
-HT_MIGRATION_MODES = compat.UniqueFrozenset([
-  HT_MIGRATION_LIVE,
-  HT_MIGRATION_NONLIVE,
-  ])
+HT_MIGRATION_LIVE = _constants.HT_MIGRATION_LIVE
+HT_MIGRATION_NONLIVE = _constants.HT_MIGRATION_NONLIVE
+HT_MIGRATION_MODES = _constants.HT_MIGRATION_MODES
 
 # Cluster Verify steps
-VERIFY_NPLUSONE_MEM = "nplusone_mem"
-VERIFY_OPTIONAL_CHECKS = compat.UniqueFrozenset([VERIFY_NPLUSONE_MEM])
+VERIFY_NPLUSONE_MEM = _constants.VERIFY_NPLUSONE_MEM
+VERIFY_OPTIONAL_CHECKS = _constants.VERIFY_OPTIONAL_CHECKS
 
 # Cluster Verify error classes
-CV_TCLUSTER = "cluster"
-CV_TGROUP = "group"
-CV_TNODE = "node"
-CV_TINSTANCE = "instance"
+CV_TCLUSTER = _constants.CV_TCLUSTER
+CV_TGROUP = _constants.CV_TGROUP
+CV_TNODE = _constants.CV_TNODE
+CV_TINSTANCE = _constants.CV_TINSTANCE
 
 # Cluster Verify error codes and documentation
-CV_ECLUSTERCFG = \
-  (CV_TCLUSTER, "ECLUSTERCFG", "Cluster configuration verification failure")
-CV_ECLUSTERCERT = \
-  (CV_TCLUSTER, "ECLUSTERCERT",
-   "Cluster certificate files verification failure")
-CV_ECLUSTERFILECHECK = \
-  (CV_TCLUSTER, "ECLUSTERFILECHECK",
-   "Cluster configuration verification failure")
-CV_ECLUSTERDANGLINGNODES = \
-  (CV_TNODE, "ECLUSTERDANGLINGNODES",
-   "Some nodes belong to non-existing groups")
-CV_ECLUSTERDANGLINGINST = \
-  (CV_TNODE, "ECLUSTERDANGLINGINST",
-   "Some instances have a non-existing primary node")
-CV_EGROUPDIFFERENTPVSIZE = \
-  (CV_TGROUP, "EGROUPDIFFERENTPVSIZE", "PVs in the group have different sizes")
-CV_EINSTANCEBADNODE = \
-  (CV_TINSTANCE, "EINSTANCEBADNODE",
-   "Instance marked as running lives on an offline node")
-CV_EINSTANCEDOWN = \
-  (CV_TINSTANCE, "EINSTANCEDOWN", "Instance not running on its primary node")
-CV_EINSTANCELAYOUT = \
-  (CV_TINSTANCE, "EINSTANCELAYOUT", "Instance has multiple secondary nodes")
-CV_EINSTANCEMISSINGDISK = \
-  (CV_TINSTANCE, "EINSTANCEMISSINGDISK", "Missing volume on an instance")
-CV_EINSTANCEFAULTYDISK = \
-  (CV_TINSTANCE, "EINSTANCEFAULTYDISK",
-   "Impossible to retrieve status for a disk")
-CV_EINSTANCEWRONGNODE = \
-  (CV_TINSTANCE, "EINSTANCEWRONGNODE", "Instance running on the wrong node")
-CV_EINSTANCESPLITGROUPS = \
-  (CV_TINSTANCE, "EINSTANCESPLITGROUPS",
-   "Instance with primary and secondary nodes in different groups")
-CV_EINSTANCEPOLICY = \
-  (CV_TINSTANCE, "EINSTANCEPOLICY",
-   "Instance does not meet policy")
-CV_EINSTANCEUNSUITABLENODE = \
-  (CV_TINSTANCE, "EINSTANCEUNSUITABLENODE",
-   "Instance running on nodes that are not suitable for it")
-CV_ENODEDRBD = \
-  (CV_TNODE, "ENODEDRBD", "Error parsing the DRBD status file")
-CV_ENODEDRBDHELPER = \
-  (CV_TNODE, "ENODEDRBDHELPER", "Error caused by the DRBD helper")
-CV_ENODEFILECHECK = \
-  (CV_TNODE, "ENODEFILECHECK",
-   "Error retrieving the checksum of the node files")
-CV_ENODEHOOKS = \
-  (CV_TNODE, "ENODEHOOKS", "Communication failure in hooks execution")
-CV_ENODEHV = \
-  (CV_TNODE, "ENODEHV", "Hypervisor parameters verification failure")
-CV_ENODELVM = \
-  (CV_TNODE, "ENODELVM", "LVM-related node error")
-CV_ENODEN1 = \
-  (CV_TNODE, "ENODEN1", "Not enough memory to accommodate instance failovers")
-CV_ENODENET = \
-  (CV_TNODE, "ENODENET", "Network-related node error")
-CV_ENODEOS = \
-  (CV_TNODE, "ENODEOS", "OS-related node error")
-CV_ENODEORPHANINSTANCE = \
-  (CV_TNODE, "ENODEORPHANINSTANCE", "Unknown intance running on a node")
-CV_ENODEORPHANLV = \
-  (CV_TNODE, "ENODEORPHANLV", "Unknown LVM logical volume")
-CV_ENODERPC = \
-  (CV_TNODE, "ENODERPC",
-   "Error during connection to the primary node of an instance")
-CV_ENODESSH = \
-  (CV_TNODE, "ENODESSH", "SSH-related node error")
-CV_ENODEVERSION = \
-  (CV_TNODE, "ENODEVERSION",
-   "Protocol version mismatch or Ganeti version mismatch")
-CV_ENODESETUP = \
-  (CV_TNODE, "ENODESETUP", "Node setup error")
-CV_ENODETIME = \
-  (CV_TNODE, "ENODETIME", "Node returned invalid time")
-CV_ENODEOOBPATH = \
-  (CV_TNODE, "ENODEOOBPATH", "Invalid Out Of Band path")
-CV_ENODEUSERSCRIPTS = \
-  (CV_TNODE, "ENODEUSERSCRIPTS", "User scripts not present or not executable")
-CV_ENODEFILESTORAGEPATHS = \
-  (CV_TNODE, "ENODEFILESTORAGEPATHS", "Detected bad file storage paths")
-
-CV_ALL_ECODES = compat.UniqueFrozenset([
-  CV_ECLUSTERCFG,
-  CV_ECLUSTERCERT,
-  CV_ECLUSTERFILECHECK,
-  CV_ECLUSTERDANGLINGNODES,
-  CV_ECLUSTERDANGLINGINST,
-  CV_EINSTANCEBADNODE,
-  CV_EINSTANCEDOWN,
-  CV_EINSTANCELAYOUT,
-  CV_EINSTANCEMISSINGDISK,
-  CV_EINSTANCEFAULTYDISK,
-  CV_EINSTANCEWRONGNODE,
-  CV_EINSTANCESPLITGROUPS,
-  CV_EINSTANCEPOLICY,
-  CV_ENODEDRBD,
-  CV_ENODEDRBDHELPER,
-  CV_ENODEFILECHECK,
-  CV_ENODEHOOKS,
-  CV_ENODEHV,
-  CV_ENODELVM,
-  CV_ENODEN1,
-  CV_ENODENET,
-  CV_ENODEOS,
-  CV_ENODEORPHANINSTANCE,
-  CV_ENODEORPHANLV,
-  CV_ENODERPC,
-  CV_ENODESSH,
-  CV_ENODEVERSION,
-  CV_ENODESETUP,
-  CV_ENODETIME,
-  CV_ENODEOOBPATH,
-  CV_ENODEUSERSCRIPTS,
-  CV_ENODEFILESTORAGEPATHS,
-  ])
-
-CV_ALL_ECODES_STRINGS = \
-  compat.UniqueFrozenset(estr for (_, estr, _) in CV_ALL_ECODES)
+CV_ECLUSTERCFG = _constants.CV_ECLUSTERCFG
+CV_ECLUSTERCERT = _constants.CV_ECLUSTERCERT
+CV_ECLUSTERFILECHECK = _constants.CV_ECLUSTERFILECHECK
+CV_ECLUSTERDANGLINGNODES = _constants.CV_ECLUSTERDANGLINGNODES
+CV_ECLUSTERDANGLINGINST = _constants.CV_ECLUSTERDANGLINGINST
+CV_EGROUPDIFFERENTPVSIZE = _constants.CV_EGROUPDIFFERENTPVSIZE
+CV_EINSTANCEBADNODE = _constants.CV_EINSTANCEBADNODE
+CV_EINSTANCEDOWN = _constants.CV_EINSTANCEDOWN
+CV_EINSTANCELAYOUT = _constants.CV_EINSTANCELAYOUT
+CV_EINSTANCEMISSINGDISK = _constants.CV_EINSTANCEMISSINGDISK
+CV_EINSTANCEFAULTYDISK = _constants.CV_EINSTANCEFAULTYDISK
+CV_EINSTANCEWRONGNODE = _constants.CV_EINSTANCEWRONGNODE
+CV_EINSTANCESPLITGROUPS = _constants.CV_EINSTANCESPLITGROUPS
+CV_EINSTANCEPOLICY = _constants.CV_EINSTANCEPOLICY
+CV_EINSTANCEUNSUITABLENODE = _constants.CV_EINSTANCEUNSUITABLENODE
+CV_EINSTANCEMISSINGCFGPARAMETER = _constants.CV_EINSTANCEMISSINGCFGPARAMETER
+CV_ENODEDRBD = _constants.CV_ENODEDRBD
+CV_ENODEDRBDVERSION = _constants.CV_ENODEDRBDVERSION
+CV_ENODEDRBDHELPER = _constants.CV_ENODEDRBDHELPER
+CV_ENODEFILECHECK = _constants.CV_ENODEFILECHECK
+CV_ENODEHOOKS = _constants.CV_ENODEHOOKS
+CV_ENODEHV = _constants.CV_ENODEHV
+CV_ENODELVM = _constants.CV_ENODELVM
+CV_ENODEN1 = _constants.CV_ENODEN1
+CV_ENODENET = _constants.CV_ENODENET
+CV_ENODEOS = _constants.CV_ENODEOS
+CV_ENODEORPHANINSTANCE = _constants.CV_ENODEORPHANINSTANCE
+CV_ENODEORPHANLV = _constants.CV_ENODEORPHANLV
+CV_ENODERPC = _constants.CV_ENODERPC
+CV_ENODESSH = _constants.CV_ENODESSH
+CV_ENODEVERSION = _constants.CV_ENODEVERSION
+CV_ENODESETUP = _constants.CV_ENODESETUP
+CV_ENODETIME = _constants.CV_ENODETIME
+CV_ENODEOOBPATH = _constants.CV_ENODEOOBPATH
+CV_ENODEUSERSCRIPTS = _constants.CV_ENODEUSERSCRIPTS
+CV_ENODEFILESTORAGEPATHS = _constants.CV_ENODEFILESTORAGEPATHS
+CV_ENODEFILESTORAGEPATHUNUSABLE = _constants.CV_ENODEFILESTORAGEPATHUNUSABLE
+CV_ENODESHAREDFILESTORAGEPATHUNUSABLE = \
+  _constants.CV_ENODESHAREDFILESTORAGEPATHUNUSABLE
+
+CV_ALL_ECODES = _constants.CV_ALL_ECODES
+CV_ALL_ECODES_STRINGS = _constants.CV_ALL_ECODES_STRINGS
 
 # Node verify constants
 NV_BRIDGES = "bridges"
 NV_DRBDHELPER = "drbd-helper"
+NV_DRBDVERSION = "drbd-version"
 NV_DRBDLIST = "drbd-list"
 NV_EXCLUSIVEPVS = "exclusive-pvs"
 NV_FILELIST = "filelist"
-NV_FILE_STORAGE_PATHS = "file-storage-paths"
+NV_ACCEPTED_STORAGE_PATHS = "allowed-file-storage-paths"
+NV_FILE_STORAGE_PATH = "file-storage-path"
+NV_SHARED_FILE_STORAGE_PATH = "shared-file-storage-path"
 NV_HVINFO = "hvinfo"
 NV_HVPARAMS = "hvparms"
 NV_HYPERVISOR = "hypervisor"
@@ -1702,94 +1508,55 @@ NV_VGLIST = "vglist"
 NV_VMNODES = "vmnodes"
 
 # Instance status
-INSTST_RUNNING = "running"
-INSTST_ADMINDOWN = "ADMIN_down"
-INSTST_ADMINOFFLINE = "ADMIN_offline"
-INSTST_NODEOFFLINE = "ERROR_nodeoffline"
-INSTST_NODEDOWN = "ERROR_nodedown"
-INSTST_WRONGNODE = "ERROR_wrongnode"
-INSTST_ERRORUP = "ERROR_up"
-INSTST_ERRORDOWN = "ERROR_down"
-INSTST_ALL = compat.UniqueFrozenset([
-  INSTST_RUNNING,
-  INSTST_ADMINDOWN,
-  INSTST_ADMINOFFLINE,
-  INSTST_NODEOFFLINE,
-  INSTST_NODEDOWN,
-  INSTST_WRONGNODE,
-  INSTST_ERRORUP,
-  INSTST_ERRORDOWN,
-  ])
+INSTST_RUNNING = _constants.INSTST_RUNNING
+INSTST_ADMINDOWN = _constants.INSTST_ADMINDOWN
+INSTST_ADMINOFFLINE = _constants.INSTST_ADMINOFFLINE
+INSTST_NODEOFFLINE = _constants.INSTST_NODEOFFLINE
+INSTST_NODEDOWN = _constants.INSTST_NODEDOWN
+INSTST_WRONGNODE = _constants.INSTST_WRONGNODE
+INSTST_ERRORUP = _constants.INSTST_ERRORUP
+INSTST_ERRORDOWN = _constants.INSTST_ERRORDOWN
+INSTST_ALL = _constants.INSTST_ALL
 
 # Admin states
-ADMINST_UP = "up"
-ADMINST_DOWN = "down"
-ADMINST_OFFLINE = "offline"
-ADMINST_ALL = compat.UniqueFrozenset([
-  ADMINST_UP,
-  ADMINST_DOWN,
-  ADMINST_OFFLINE,
-  ])
+ADMINST_UP = _constants.ADMINST_UP
+ADMINST_DOWN = _constants.ADMINST_DOWN
+ADMINST_OFFLINE = _constants.ADMINST_OFFLINE
+ADMINST_ALL = _constants.ADMINST_ALL
 
 # Node roles
-NR_REGULAR = "R"
-NR_MASTER = "M"
-NR_MCANDIDATE = "C"
-NR_DRAINED = "D"
-NR_OFFLINE = "O"
-NR_ALL = compat.UniqueFrozenset([
-  NR_REGULAR,
-  NR_MASTER,
-  NR_MCANDIDATE,
-  NR_DRAINED,
-  NR_OFFLINE,
-  ])
+NR_REGULAR = _constants.NR_REGULAR
+NR_MASTER = _constants.NR_MASTER
+NR_MCANDIDATE = _constants.NR_MCANDIDATE
+NR_DRAINED = _constants.NR_DRAINED
+NR_OFFLINE = _constants.NR_OFFLINE
+NR_ALL = _constants.NR_ALL
 
 # SSL certificate check constants (in days)
 SSL_CERT_EXPIRATION_WARN = 30
 SSL_CERT_EXPIRATION_ERROR = 7
 
 # Allocator framework constants
-IALLOCATOR_VERSION = 2
-IALLOCATOR_DIR_IN = "in"
-IALLOCATOR_DIR_OUT = "out"
-VALID_IALLOCATOR_DIRECTIONS = compat.UniqueFrozenset([
-  IALLOCATOR_DIR_IN,
-  IALLOCATOR_DIR_OUT,
-  ])
-IALLOCATOR_MODE_ALLOC = "allocate"
-IALLOCATOR_MODE_RELOC = "relocate"
-IALLOCATOR_MODE_CHG_GROUP = "change-group"
-IALLOCATOR_MODE_NODE_EVAC = "node-evacuate"
-IALLOCATOR_MODE_MULTI_ALLOC = "multi-allocate"
-VALID_IALLOCATOR_MODES = compat.UniqueFrozenset([
-  IALLOCATOR_MODE_ALLOC,
-  IALLOCATOR_MODE_RELOC,
-  IALLOCATOR_MODE_CHG_GROUP,
-  IALLOCATOR_MODE_NODE_EVAC,
-  IALLOCATOR_MODE_MULTI_ALLOC,
-  ])
-IALLOCATOR_SEARCH_PATH = _autoconf.IALLOCATOR_SEARCH_PATH
-DEFAULT_IALLOCATOR_SHORTCUT = "."
-
-IALLOCATOR_NEVAC_PRI = "primary-only"
-IALLOCATOR_NEVAC_SEC = "secondary-only"
-IALLOCATOR_NEVAC_ALL = "all"
-IALLOCATOR_NEVAC_MODES = compat.UniqueFrozenset([
-  IALLOCATOR_NEVAC_PRI,
-  IALLOCATOR_NEVAC_SEC,
-  IALLOCATOR_NEVAC_ALL,
-  ])
+IALLOCATOR_VERSION = _constants.IALLOCATOR_VERSION
+IALLOCATOR_DIR_IN = _constants.IALLOCATOR_DIR_IN
+IALLOCATOR_DIR_OUT = _constants.IALLOCATOR_DIR_OUT
+VALID_IALLOCATOR_DIRECTIONS = _constants.VALID_IALLOCATOR_DIRECTIONS
+
+IALLOCATOR_MODE_ALLOC = _constants.IALLOCATOR_MODE_ALLOC
+IALLOCATOR_MODE_RELOC = _constants.IALLOCATOR_MODE_RELOC
+IALLOCATOR_MODE_CHG_GROUP = _constants.IALLOCATOR_MODE_CHG_GROUP
+IALLOCATOR_MODE_NODE_EVAC = _constants.IALLOCATOR_MODE_NODE_EVAC
+IALLOCATOR_MODE_MULTI_ALLOC = _constants.IALLOCATOR_MODE_MULTI_ALLOC
+VALID_IALLOCATOR_MODES = _constants.VALID_IALLOCATOR_MODES
+
+IALLOCATOR_SEARCH_PATH = _constants.IALLOCATOR_SEARCH_PATH
+DEFAULT_IALLOCATOR_SHORTCUT = _constants.DEFAULT_IALLOCATOR_SHORTCUT
 
 # Node evacuation
-NODE_EVAC_PRI = "primary-only"
-NODE_EVAC_SEC = "secondary-only"
-NODE_EVAC_ALL = "all"
-NODE_EVAC_MODES = compat.UniqueFrozenset([
-  NODE_EVAC_PRI,
-  NODE_EVAC_SEC,
-  NODE_EVAC_ALL,
-  ])
+NODE_EVAC_PRI = _constants.NODE_EVAC_PRI
+NODE_EVAC_SEC = _constants.NODE_EVAC_SEC
+NODE_EVAC_ALL = _constants.NODE_EVAC_ALL
+NODE_EVAC_MODES = _constants.NODE_EVAC_MODES
 
 # Job queue
 JOB_QUEUE_VERSION = 1
@@ -1803,58 +1570,37 @@ JOB_FILE_RE = re.compile(r"^job-(%s)$" % JOB_ID_TEMPLATE)
 JOB_NOTCHANGED = "nochange"
 
 # Job status
-JOB_STATUS_QUEUED = "queued"
-JOB_STATUS_WAITING = "waiting"
-JOB_STATUS_CANCELING = "canceling"
-JOB_STATUS_RUNNING = "running"
-JOB_STATUS_CANCELED = "canceled"
-JOB_STATUS_SUCCESS = "success"
-JOB_STATUS_ERROR = "error"
-JOBS_PENDING = compat.UniqueFrozenset([
-  JOB_STATUS_QUEUED,
-  JOB_STATUS_WAITING,
-  JOB_STATUS_CANCELING,
-  ])
-JOBS_FINALIZED = compat.UniqueFrozenset([
-  JOB_STATUS_CANCELED,
-  JOB_STATUS_SUCCESS,
-  JOB_STATUS_ERROR,
-  ])
-JOB_STATUS_ALL = compat.UniqueFrozenset([
-  JOB_STATUS_RUNNING,
-  ]) | JOBS_PENDING | JOBS_FINALIZED
+JOB_STATUS_QUEUED = _constants.JOB_STATUS_QUEUED
+JOB_STATUS_WAITING = _constants.JOB_STATUS_WAITING
+JOB_STATUS_CANCELING = _constants.JOB_STATUS_CANCELING
+JOB_STATUS_RUNNING = _constants.JOB_STATUS_RUNNING
+JOB_STATUS_CANCELED = _constants.JOB_STATUS_CANCELED
+JOB_STATUS_SUCCESS = _constants.JOB_STATUS_SUCCESS
+JOB_STATUS_ERROR = _constants.JOB_STATUS_ERROR
+JOBS_PENDING = _constants.JOBS_PENDING
+JOBS_FINALIZED = _constants.JOBS_FINALIZED
+JOB_STATUS_ALL = _constants.JOB_STATUS_ALL
 
 # OpCode status
 # not yet finalized
-OP_STATUS_QUEUED = "queued"
-OP_STATUS_WAITING = "waiting"
-OP_STATUS_CANCELING = "canceling"
-OP_STATUS_RUNNING = "running"
+OP_STATUS_QUEUED = _constants.OP_STATUS_QUEUED
+OP_STATUS_WAITING = _constants.OP_STATUS_WAITING
+OP_STATUS_CANCELING = _constants.OP_STATUS_CANCELING
+OP_STATUS_RUNNING = _constants.OP_STATUS_RUNNING
 # finalized
-OP_STATUS_CANCELED = "canceled"
-OP_STATUS_SUCCESS = "success"
-OP_STATUS_ERROR = "error"
-OPS_FINALIZED = compat.UniqueFrozenset([
-  OP_STATUS_CANCELED,
-  OP_STATUS_SUCCESS,
-  OP_STATUS_ERROR,
-  ])
+OP_STATUS_CANCELED = _constants.OP_STATUS_CANCELED
+OP_STATUS_SUCCESS = _constants.OP_STATUS_SUCCESS
+OP_STATUS_ERROR = _constants.OP_STATUS_ERROR
+OPS_FINALIZED = _constants.OPS_FINALIZED
 
 # OpCode priority
-OP_PRIO_LOWEST = +19
-OP_PRIO_HIGHEST = -20
-
-OP_PRIO_LOW = +10
-OP_PRIO_NORMAL = 0
-OP_PRIO_HIGH = -10
-
-OP_PRIO_SUBMIT_VALID = compat.UniqueFrozenset([
-  OP_PRIO_LOW,
-  OP_PRIO_NORMAL,
-  OP_PRIO_HIGH,
-  ])
-
-OP_PRIO_DEFAULT = OP_PRIO_NORMAL
+OP_PRIO_LOWEST = _constants.OP_PRIO_LOWEST
+OP_PRIO_HIGHEST = _constants.OP_PRIO_HIGHEST
+OP_PRIO_LOW = _constants.OP_PRIO_LOW
+OP_PRIO_NORMAL = _constants.OP_PRIO_NORMAL
+OP_PRIO_HIGH = _constants.OP_PRIO_HIGH
+OP_PRIO_SUBMIT_VALID = _constants.OP_PRIO_SUBMIT_VALID
+OP_PRIO_DEFAULT = _constants.OP_PRIO_DEFAULT
 
 # Lock recalculate mode
 LOCKS_REPLACE = "replace"
@@ -1870,9 +1616,9 @@ LOCK_ATTEMPTS_MAXWAIT = 15.0
 LOCK_ATTEMPTS_MINWAIT = 1.0
 
 # Execution log types
-ELOG_MESSAGE = "message"
-ELOG_REMOTE_IMPORT = "remote-import"
-ELOG_JQUEUE_TEST = "jqueue-test"
+ELOG_MESSAGE = _constants.ELOG_MESSAGE
+ELOG_REMOTE_IMPORT = _constants.ELOG_REMOTE_IMPORT
+ELOG_JQUEUE_TEST = _constants.ELOG_JQUEUE_TEST
 
 # /etc/hosts modification
 ETC_HOSTS_ADD = "add"
@@ -2006,6 +1752,26 @@ SS_UID_POOL = "uid_pool"
 SS_NODEGROUPS = "nodegroups"
 SS_NETWORKS = "networks"
 
+# This is not a complete SSCONF key, but the prefix for the hypervisor keys
+SS_HVPARAMS_PREF = "hvparams_"
+
+# Hvparams keys:
+SS_HVPARAMS_XEN_PVM = SS_HVPARAMS_PREF + HT_XEN_PVM
+SS_HVPARAMS_XEN_FAKE = SS_HVPARAMS_PREF + HT_FAKE
+SS_HVPARAMS_XEN_HVM = SS_HVPARAMS_PREF + HT_XEN_HVM
+SS_HVPARAMS_XEN_KVM = SS_HVPARAMS_PREF + HT_KVM
+SS_HVPARAMS_XEN_CHROOT = SS_HVPARAMS_PREF + HT_CHROOT
+SS_HVPARAMS_XEN_LXC = SS_HVPARAMS_PREF + HT_LXC
+
+VALID_SS_HVPARAMS_KEYS = compat.UniqueFrozenset([
+  SS_HVPARAMS_XEN_PVM,
+  SS_HVPARAMS_XEN_FAKE,
+  SS_HVPARAMS_XEN_HVM,
+  SS_HVPARAMS_XEN_KVM,
+  SS_HVPARAMS_XEN_CHROOT,
+  SS_HVPARAMS_XEN_LXC,
+  ])
+
 SS_FILE_PERMS = 0444
 
 # cluster wide default parameters
@@ -2027,6 +1793,10 @@ HVC_DEFAULTS = {
     HV_CPU_MASK: CPU_PINNING_ALL,
     HV_CPU_CAP: 0,
     HV_CPU_WEIGHT: 256,
+    HV_VIF_SCRIPT: "",
+    HV_XEN_CMD: XEN_CMD_XM,
+    HV_XEN_CPUID: "",
+    HV_SOUNDHW: "",
     },
   HT_XEN_HVM: {
     HV_BOOT_ORDER: "cd",
@@ -2049,7 +1819,11 @@ HVC_DEFAULTS = {
     HV_CPU_CAP: 0,
     HV_CPU_WEIGHT: 256,
     HV_VIF_TYPE: HT_HVM_VIF_IOEMU,
+    HV_VIF_SCRIPT: "",
     HV_VIRIDIAN: False,
+    HV_XEN_CMD: XEN_CMD_XM,
+    HV_XEN_CPUID: "",
+    HV_SOUNDHW: "",
     },
   HT_KVM: {
     HV_KVM_PATH: KVM_PATH,
@@ -2110,7 +1884,9 @@ HVC_DEFAULTS = {
     HV_KVM_MACHINE_VERSION: "",
     HV_VNET_HDR: True,
     },
-  HT_FAKE: {},
+  HT_FAKE: {
+    HV_MIGRATION_MODE: HT_MIGRATION_LIVE,
+  },
   HT_CHROOT: {
     HV_INIT_SCRIPT: "/ganeti-chroot",
     },
@@ -2123,6 +1899,7 @@ HVC_GLOBALS = compat.UniqueFrozenset([
   HV_MIGRATION_PORT,
   HV_MIGRATION_BANDWIDTH,
   HV_MIGRATION_MODE,
+  HV_XEN_CMD,
   ])
 
 BEC_DEFAULTS = {
@@ -2138,6 +1915,9 @@ NDC_DEFAULTS = {
   ND_OOB_PROGRAM: "",
   ND_SPINDLE_COUNT: 1,
   ND_EXCLUSIVE_STORAGE: False,
+  ND_OVS: False,
+  ND_OVS_NAME: DEFAULT_OVS,
+  ND_OVS_LINK: ""
   }
 
 NDC_GLOBALS = compat.UniqueFrozenset([
@@ -2145,13 +1925,14 @@ NDC_GLOBALS = compat.UniqueFrozenset([
   ])
 
 DISK_LD_DEFAULTS = {
-  LD_DRBD8: {
+  DT_DRBD8: {
     LDP_RESYNC_RATE: CLASSIC_DRBD_SYNC_SPEED,
-    LDP_BARRIERS: _autoconf.DRBD_BARRIERS,
-    LDP_NO_META_FLUSH: _autoconf.DRBD_NO_META_FLUSH,
+    LDP_BARRIERS: _constants.DRBD_BARRIERS,
+    LDP_NO_META_FLUSH: _constants.DRBD_NO_META_FLUSH,
     LDP_DEFAULT_METAVG: DEFAULT_VG,
     LDP_DISK_CUSTOM: "",
     LDP_NET_CUSTOM: "",
+    LDP_PROTOCOL: DRBD_DEFAULT_NET_PROTOCOL,
     LDP_DYNAMIC_RESYNC: False,
 
     # The default values for the DRBD dynamic resync speed algorithm
@@ -2165,24 +1946,26 @@ DISK_LD_DEFAULTS = {
     LDP_MAX_RATE: CLASSIC_DRBD_SYNC_SPEED, # KiB/s
     LDP_MIN_RATE: 4 * 1024, # KiB/s
     },
-  LD_LV: {
-    LDP_STRIPES: _autoconf.LVM_STRIPECOUNT
+  DT_PLAIN: {
+    LDP_STRIPES: _constants.LVM_STRIPECOUNT
     },
-  LD_FILE: {},
-  LD_BLOCKDEV: {},
-  LD_RBD: {
-    LDP_POOL: "rbd"
+  DT_FILE: {},
+  DT_SHARED_FILE: {},
+  DT_BLOCK: {},
+  DT_RBD: {
+    LDP_POOL: "rbd",
+    LDP_ACCESS: DISK_KERNELSPACE,
     },
-  LD_EXT: {},
+  DT_EXT: {},
   }
 
 # readability shortcuts
-_LV_DEFAULTS = DISK_LD_DEFAULTS[LD_LV]
-_DRBD_DEFAULTS = DISK_LD_DEFAULTS[LD_DRBD8]
+_LV_DEFAULTS = DISK_LD_DEFAULTS[DT_PLAIN]
+_DRBD_DEFAULTS = DISK_LD_DEFAULTS[DT_DRBD8]
 
 DISK_DT_DEFAULTS = {
   DT_PLAIN: {
-    LV_STRIPES: DISK_LD_DEFAULTS[LD_LV][LDP_STRIPES],
+    LV_STRIPES: DISK_LD_DEFAULTS[DT_PLAIN][LDP_STRIPES],
     },
   DT_DRBD8: {
     DRBD_RESYNC_RATE: _DRBD_DEFAULTS[LDP_RESYNC_RATE],
@@ -2193,6 +1976,7 @@ DISK_DT_DEFAULTS = {
     DRBD_DEFAULT_METAVG: _DRBD_DEFAULTS[LDP_DEFAULT_METAVG],
     DRBD_DISK_CUSTOM: _DRBD_DEFAULTS[LDP_DISK_CUSTOM],
     DRBD_NET_CUSTOM: _DRBD_DEFAULTS[LDP_NET_CUSTOM],
+    DRBD_PROTOCOL: _DRBD_DEFAULTS[LDP_PROTOCOL],
     DRBD_DYNAMIC_RESYNC: _DRBD_DEFAULTS[LDP_DYNAMIC_RESYNC],
     DRBD_PLAN_AHEAD: _DRBD_DEFAULTS[LDP_PLAN_AHEAD],
     DRBD_FILL_TARGET: _DRBD_DEFAULTS[LDP_FILL_TARGET],
@@ -2205,7 +1989,8 @@ DISK_DT_DEFAULTS = {
   DT_SHARED_FILE: {},
   DT_BLOCK: {},
   DT_RBD: {
-    RBD_POOL: DISK_LD_DEFAULTS[LD_RBD][LDP_POOL]
+    RBD_POOL: DISK_LD_DEFAULTS[DT_RBD][LDP_POOL],
+    RBD_ACCESS: DISK_LD_DEFAULTS[DT_RBD][LDP_ACCESS],
     },
   DT_EXT: {},
   }
@@ -2216,6 +2001,7 @@ del _LV_DEFAULTS, _DRBD_DEFAULTS
 NICC_DEFAULTS = {
   NIC_MODE: NIC_MODE_BRIDGED,
   NIC_LINK: DEFAULT_BRIDGE,
+  NIC_VLAN: VALUE_HS_NOTHING,
   }
 
 # All of the following values are quite arbitrarily - there are no
@@ -2261,94 +2047,79 @@ PART_MARGIN = .01
 # Space reserved when creating instance disks
 PART_RESERVED = .02
 
-CONFD_PROTOCOL_VERSION = 1
+CONFD_PROTOCOL_VERSION = _constants.CONFD_PROTOCOL_VERSION
 
-CONFD_REQ_PING = 0
-CONFD_REQ_NODE_ROLE_BYNAME = 1
-CONFD_REQ_NODE_PIP_BY_INSTANCE_IP = 2
-CONFD_REQ_CLUSTER_MASTER = 3
-CONFD_REQ_NODE_PIP_LIST = 4
-CONFD_REQ_MC_PIP_LIST = 5
-CONFD_REQ_INSTANCES_IPS_LIST = 6
-CONFD_REQ_NODE_DRBD = 7
-CONFD_REQ_NODE_INSTANCES = 8
+CONFD_REQ_PING = _constants.CONFD_REQ_PING
+CONFD_REQ_NODE_ROLE_BYNAME = _constants.CONFD_REQ_NODE_ROLE_BYNAME
+CONFD_REQ_NODE_PIP_BY_INSTANCE_IP = _constants.CONFD_REQ_NODE_PIP_BY_INSTANCE_IP
+CONFD_REQ_CLUSTER_MASTER = _constants.CONFD_REQ_CLUSTER_MASTER
+CONFD_REQ_NODE_PIP_LIST = _constants.CONFD_REQ_NODE_PIP_LIST
+CONFD_REQ_MC_PIP_LIST = _constants.CONFD_REQ_MC_PIP_LIST
+CONFD_REQ_INSTANCES_IPS_LIST = _constants.CONFD_REQ_INSTANCES_IPS_LIST
+CONFD_REQ_NODE_DRBD = _constants.CONFD_REQ_NODE_DRBD
+CONFD_REQ_NODE_INSTANCES = _constants.CONFD_REQ_NODE_INSTANCES
+CONFD_REQS = _constants.CONFD_REQS
 
 # Confd request query fields. These are used to narrow down queries.
 # These must be strings rather than integers, because json-encoding
 # converts them to strings anyway, as they're used as dict-keys.
-CONFD_REQQ_LINK = "0"
-CONFD_REQQ_IP = "1"
-CONFD_REQQ_IPLIST = "2"
-CONFD_REQQ_FIELDS = "3"
-
-CONFD_REQFIELD_NAME = "0"
-CONFD_REQFIELD_IP = "1"
-CONFD_REQFIELD_MNODE_PIP = "2"
-
-CONFD_REQS = compat.UniqueFrozenset([
-  CONFD_REQ_PING,
-  CONFD_REQ_NODE_ROLE_BYNAME,
-  CONFD_REQ_NODE_PIP_BY_INSTANCE_IP,
-  CONFD_REQ_CLUSTER_MASTER,
-  CONFD_REQ_NODE_PIP_LIST,
-  CONFD_REQ_MC_PIP_LIST,
-  CONFD_REQ_INSTANCES_IPS_LIST,
-  CONFD_REQ_NODE_DRBD,
-  ])
-
-CONFD_REPL_STATUS_OK = 0
-CONFD_REPL_STATUS_ERROR = 1
-CONFD_REPL_STATUS_NOTIMPLEMENTED = 2
-
-CONFD_REPL_STATUSES = compat.UniqueFrozenset([
-  CONFD_REPL_STATUS_OK,
-  CONFD_REPL_STATUS_ERROR,
-  CONFD_REPL_STATUS_NOTIMPLEMENTED,
-  ])
-
-(CONFD_NODE_ROLE_MASTER,
- CONFD_NODE_ROLE_CANDIDATE,
- CONFD_NODE_ROLE_OFFLINE,
- CONFD_NODE_ROLE_DRAINED,
- CONFD_NODE_ROLE_REGULAR,
- ) = range(5)
-
-# A few common errors for confd
-CONFD_ERROR_UNKNOWN_ENTRY = 1
-CONFD_ERROR_INTERNAL = 2
-CONFD_ERROR_ARGUMENT = 3
+CONFD_REQQ_LINK = _constants.CONFD_REQQ_LINK
+CONFD_REQQ_IP = _constants.CONFD_REQQ_IP
+CONFD_REQQ_IPLIST = _constants.CONFD_REQQ_IPLIST
+CONFD_REQQ_FIELDS = _constants.CONFD_REQQ_FIELDS
+
+# FIXME: perhaps update code that uses these constants to deal with
+# integers instead of strings
+CONFD_REQFIELD_NAME = str(_constants.CONFD_REQFIELD_NAME)
+CONFD_REQFIELD_IP = str(_constants.CONFD_REQFIELD_IP)
+CONFD_REQFIELD_MNODE_PIP = str(_constants.CONFD_REQFIELD_MNODE_PIP)
+
+CONFD_REPL_STATUS_OK = _constants.CONFD_REPL_STATUS_OK
+CONFD_REPL_STATUS_ERROR = _constants.CONFD_REPL_STATUS_ERROR
+CONFD_REPL_STATUS_NOTIMPLEMENTED = _constants.CONFD_REPL_STATUS_NOTIMPLEMENTED
+CONFD_REPL_STATUSES = _constants.CONFD_REPL_STATUSES
+
+CONFD_NODE_ROLE_MASTER = _constants.CONFD_NODE_ROLE_MASTER
+CONFD_NODE_ROLE_CANDIDATE = _constants.CONFD_NODE_ROLE_CANDIDATE
+CONFD_NODE_ROLE_OFFLINE = _constants.CONFD_NODE_ROLE_OFFLINE
+CONFD_NODE_ROLE_DRAINED = _constants.CONFD_NODE_ROLE_DRAINED
+CONFD_NODE_ROLE_REGULAR = _constants.CONFD_NODE_ROLE_REGULAR
+
+CONFD_ERROR_UNKNOWN_ENTRY = _constants.CONFD_ERROR_UNKNOWN_ENTRY
+CONFD_ERROR_INTERNAL = _constants.CONFD_ERROR_INTERNAL
+CONFD_ERROR_ARGUMENT = _constants.CONFD_ERROR_ARGUMENT
 
 # Each request is "salted" by the current timestamp.
 # This constants decides how many seconds of skew to accept.
 # TODO: make this a default and allow the value to be more configurable
-CONFD_MAX_CLOCK_SKEW = 2 * NODE_MAX_CLOCK_SKEW
+CONFD_MAX_CLOCK_SKEW = _constants.CONFD_MAX_CLOCK_SKEW
 
 # When we haven't reloaded the config for more than this amount of
 # seconds, we force a test to see if inotify is betraying us. Using a
 # prime number to ensure we get less chance of 'same wakeup' with
 # other processes.
-CONFD_CONFIG_RELOAD_TIMEOUT = 17
+CONFD_CONFIG_RELOAD_TIMEOUT = _constants.CONFD_CONFIG_RELOAD_TIMEOUT
 
 # If we receive more than one update in this amount of microseconds,
 # we move to polling every RATELIMIT seconds, rather than relying on
 # inotify, to be able to serve more requests.
-CONFD_CONFIG_RELOAD_RATELIMIT = 250000
+CONFD_CONFIG_RELOAD_RATELIMIT = _constants.CONFD_CONFIG_RELOAD_RATELIMIT
 
 # Magic number prepended to all confd queries.
 # This allows us to distinguish different types of confd protocols and handle
 # them. For example by changing this we can move the whole payload to be
 # compressed, or move away from json.
-CONFD_MAGIC_FOURCC = "plj0"
+CONFD_MAGIC_FOURCC = _constants.CONFD_MAGIC_FOURCC
 
 # By default a confd request is sent to the minimum between this number and all
 # MCs. 6 was chosen because even in the case of a disastrous 50% response rate,
 # we should have enough answers to be able to compare more than one.
-CONFD_DEFAULT_REQ_COVERAGE = 6
+CONFD_DEFAULT_REQ_COVERAGE = _constants.CONFD_DEFAULT_REQ_COVERAGE
 
 # Timeout in seconds to expire pending query request in the confd client
 # library. We don't actually expect any answer more than 10 seconds after we
 # sent a request.
-CONFD_CLIENT_EXPIRE_TIMEOUT = 10
+CONFD_CLIENT_EXPIRE_TIMEOUT = _constants.CONFD_CLIENT_EXPIRE_TIMEOUT
 
 # Maximum UDP datagram size.
 # On IPv4: 64K - 20 (ip header size) - 8 (udp header size) = 65507
@@ -2368,23 +2139,19 @@ PGREP = "pgrep"
 INITIAL_NODE_GROUP_NAME = "default"
 
 # Possible values for NodeGroup.alloc_policy
-ALLOC_POLICY_PREFERRED = "preferred"
-ALLOC_POLICY_LAST_RESORT = "last_resort"
-ALLOC_POLICY_UNALLOCABLE = "unallocable"
-VALID_ALLOC_POLICIES = [
-  ALLOC_POLICY_PREFERRED,
-  ALLOC_POLICY_LAST_RESORT,
-  ALLOC_POLICY_UNALLOCABLE,
-  ]
+ALLOC_POLICY_PREFERRED = _constants.ALLOC_POLICY_PREFERRED
+ALLOC_POLICY_LAST_RESORT = _constants.ALLOC_POLICY_LAST_RESORT
+ALLOC_POLICY_UNALLOCABLE = _constants.ALLOC_POLICY_UNALLOCABLE
+VALID_ALLOC_POLICIES = _constants.VALID_ALLOC_POLICIES
 
 # Temporary external/shared storage parameters
-BLOCKDEV_DRIVER_MANUAL = "manual"
+BLOCKDEV_DRIVER_MANUAL = _constants.BLOCKDEV_DRIVER_MANUAL
 
 # qemu-img path, required for ovfconverter
-QEMUIMG_PATH = _autoconf.QEMUIMG_PATH
+QEMUIMG_PATH = _constants.QEMUIMG_PATH
 
 # Whether htools was enabled at compilation time
-HTOOLS = _autoconf.HTOOLS
+HTOOLS = _constants.HTOOLS
 # The hail iallocator
 IALLOC_HAIL = "hail"
 
@@ -2422,45 +2189,36 @@ NDS_SSCONF = "ssconf"
 NDS_START_NODE_DAEMON = "start_node_daemon"
 
 # Path generating random UUID
-RANDOM_UUID_FILE = "/proc/sys/kernel/random/uuid"
+RANDOM_UUID_FILE = _constants.RANDOM_UUID_FILE
 
 # Regex string for verifying a UUID
 UUID_REGEX = "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
 
 # Auto-repair tag prefixes
-AUTO_REPAIR_TAG_PREFIX = "ganeti:watcher:autorepair:"
-AUTO_REPAIR_TAG_ENABLED = AUTO_REPAIR_TAG_PREFIX
-AUTO_REPAIR_TAG_SUSPENDED = AUTO_REPAIR_TAG_ENABLED + "suspend:"
-AUTO_REPAIR_TAG_PENDING = AUTO_REPAIR_TAG_PREFIX + "pending:"
-AUTO_REPAIR_TAG_RESULT = AUTO_REPAIR_TAG_PREFIX + "result:"
+AUTO_REPAIR_TAG_PREFIX = _constants.AUTO_REPAIR_TAG_PREFIX
+AUTO_REPAIR_TAG_ENABLED = _constants.AUTO_REPAIR_TAG_ENABLED
+AUTO_REPAIR_TAG_SUSPENDED = _constants.AUTO_REPAIR_TAG_SUSPENDED
+AUTO_REPAIR_TAG_PENDING = _constants.AUTO_REPAIR_TAG_PENDING
+AUTO_REPAIR_TAG_RESULT = _constants.AUTO_REPAIR_TAG_RESULT
 
 # Auto-repair levels
-AUTO_REPAIR_FIX_STORAGE = "fix-storage"
-AUTO_REPAIR_MIGRATE = "migrate"
-AUTO_REPAIR_FAILOVER = "failover"
-AUTO_REPAIR_REINSTALL = "reinstall"
-AUTO_REPAIR_ALL_TYPES = [
-  AUTO_REPAIR_FIX_STORAGE,
-  AUTO_REPAIR_MIGRATE,
-  AUTO_REPAIR_FAILOVER,
-  AUTO_REPAIR_REINSTALL,
-]
+AUTO_REPAIR_FIX_STORAGE = _constants.AUTO_REPAIR_FIX_STORAGE
+AUTO_REPAIR_MIGRATE = _constants.AUTO_REPAIR_MIGRATE
+AUTO_REPAIR_FAILOVER = _constants.AUTO_REPAIR_FAILOVER
+AUTO_REPAIR_REINSTALL = _constants.AUTO_REPAIR_REINSTALL
+AUTO_REPAIR_ALL_TYPES = _constants.AUTO_REPAIR_ALL_TYPES
 
 # Auto-repair results
-AUTO_REPAIR_SUCCESS = "success"
-AUTO_REPAIR_FAILURE = "failure"
-AUTO_REPAIR_ENOPERM = "enoperm"
-AUTO_REPAIR_ALL_RESULTS = frozenset([
-    AUTO_REPAIR_SUCCESS,
-    AUTO_REPAIR_FAILURE,
-    AUTO_REPAIR_ENOPERM,
-])
+AUTO_REPAIR_SUCCESS = _constants.AUTO_REPAIR_SUCCESS
+AUTO_REPAIR_FAILURE = _constants.AUTO_REPAIR_FAILURE
+AUTO_REPAIR_ENOPERM = _constants.AUTO_REPAIR_ENOPERM
+AUTO_REPAIR_ALL_RESULTS = _constants.AUTO_REPAIR_ALL_RESULTS
 
 # The version identifier for builtin data collectors
-BUILTIN_DATA_COLLECTOR_VERSION = "B"
+BUILTIN_DATA_COLLECTOR_VERSION = _constants.BUILTIN_DATA_COLLECTOR_VERSION
 
 # The reason trail opcode parameter name
-OPCODE_REASON = "reason"
+OPCODE_REASON = _constants.OPCODE_REASON
 
 # The source reasons for the execution of an OpCode
 OPCODE_REASON_SRC_CLIENT = "gnt:client"
@@ -2477,5 +2235,27 @@ OPCODE_REASON_SOURCES = compat.UniqueFrozenset([
   OPCODE_REASON_SRC_USER,
   ])
 
+DISKSTATS_FILE = _constants.DISKSTATS_FILE
+
+# CPU load collector variables
+STAT_FILE = _constants.STAT_FILE
+CPUAVGLOAD_BUFFER_SIZE = _constants.CPUAVGLOAD_BUFFER_SIZE
+CPUAVGLOAD_WINDOW_SIZE = _constants.CPUAVGLOAD_WINDOW_SIZE
+
+# Mond's variable for periodical data collection
+MOND_TIME_INTERVAL = _constants.MOND_TIME_INTERVAL
+
+# MonD's latest API version
+MOND_LATEST_API_VERSION = 1
+
+# Timeouts for upgrades
+
+UPGRADE_QUEUE_DRAIN_TIMEOUT = _constants.UPGRADE_QUEUE_DRAIN_TIMEOUT
+UPGRADE_QUEUE_POLL_INTERVAL = _constants.UPGRADE_QUEUE_POLL_INTERVAL
+
 # Do not re-export imported modules
-del re, _vcsversion, _autoconf, socket, pathutils, compat
+del re, _vcsversion, _constants, socket, pathutils, compat
+
+
+ALLOCATABLE_KEY = "allocatable"
+FAILED_KEY = "failed"