Remove old invalid-os related functionality

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 82d9186..48626f2 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -251,7 +251,6 @@ DEFAULT_MAC_PREFIX = "aa:00:00"
  RPC_ENCODING_ZLIB_BASE64) = range(2)
 
 # os related constants
-OS_VALID_STATUS = "VALID"
 OS_SCRIPT_CREATE = 'create'
 OS_SCRIPT_IMPORT = 'import'
 OS_SCRIPT_EXPORT = 'export'
@@ -346,6 +345,21 @@ BES_PARAMETERS = frozenset(BES_PARAMETER_TYPES.keys())
 # Instance Parameters Profile
 PP_DEFAULT = "default"
 
+NIC_MODE = "mode"
+NIC_LINK = "link"
+
+NIC_MODE_BRIDGED = "bridged"
+NIC_MODE_ROUTED = "routed"
+
+NIC_VALID_MODES = frozenset([NIC_MODE_BRIDGED, NIC_MODE_ROUTED])
+
+NICS_PARAMETER_TYPES = {
+    NIC_MODE: VTYPE_STRING,
+    NIC_LINK: VTYPE_STRING,
+    }
+
+NICS_PARAMETERS = frozenset(NICS_PARAMETER_TYPES.keys())
+
 # Hypervisor constants
 HT_XEN_PVM = "xen-pvm"
 HT_FAKE = "fake"
@@ -425,9 +439,6 @@ IALLOCATOR_DIR_OUT = "out"
 IALLOCATOR_MODE_ALLOC = "allocate"
 IALLOCATOR_MODE_RELOC = "relocate"
 IALLOCATOR_SEARCH_PATH = _autoconf.IALLOCATOR_SEARCH_PATH
-IARUN_NOTFOUND = 1
-IARUN_FAILURE = 2
-IARUN_SUCCESS = 3
 
 # Job queue
 JOB_QUEUE_VERSION = 1
@@ -535,4 +546,9 @@ BEC_DEFAULTS = {
   BE_AUTO_BALANCE: True,
   }
 
+NICC_DEFAULTS = {
+  NIC_MODE: NIC_MODE_BRIDGED,
+  NIC_LINK: DEFAULT_BRIDGE,
+  }
+
 MASTER_POOL_SIZE_DEFAULT = 10