Remove constant for disk wipe block size

[ganeti-local] / qa / qa_config.py

diff --git a/qa/qa_config.py b/qa/qa_config.py
index 2cf8d50..635aec8 100644 (file)
--- a/qa/qa_config.py
+++ b/qa/qa_config.py
@@ -25,6 +25,7 @@
 
 import os
 
 
 import os
 

+from ganeti import constants

 from ganeti import utils
 from ganeti import serializer
 from ganeti import compat
 from ganeti import utils
 from ganeti import serializer
 from ganeti import compat

@@ -33,6 +34,7 @@ import qa_error
 
 
 _INSTANCE_CHECK_KEY = "instance-check"
 
 
 _INSTANCE_CHECK_KEY = "instance-check"

+_ENABLED_HV_KEY = "enabled-hypervisors"

 
 
 cfg = None
 
 
 cfg = None

@@ -67,9 +69,18 @@ def Validate():
       raise qa_error.Error("Can't find instance check script '%s': %s" %
                            (check, err))
 
       raise qa_error.Error("Can't find instance check script '%s': %s" %
                            (check, err))
 

+  enabled_hv = frozenset(GetEnabledHypervisors())
+  if not enabled_hv:
+    raise qa_error.Error("No hypervisor is enabled")
+
+  difference = enabled_hv - constants.HYPER_TYPES
+  if difference:
+    raise qa_error.Error("Unknown hypervisor(s) enabled: %s" %
+                         utils.CommaJoin(difference))
+

 
 def get(name, default=None):
 
 def get(name, default=None):

-  return cfg.get(name, default)
+  return cfg.get(name, default) # pylint: disable=E1103

 
 
 class Either:
 
 
 class Either:

@@ -138,7 +149,7 @@ def TestEnabled(tests, _cfg=None):
     _cfg = cfg
 
   # Get settings for all tests
     _cfg = cfg
 
   # Get settings for all tests

-  cfg_tests = _cfg.get("tests", {})
+  cfg_tests = _cfg.get("tests", {}) # pylint: disable=E1103

 
   # Get default setting
   default = cfg_tests.get("default", True)
 
   # Get default setting
   default = cfg_tests.get("default", True)

@@ -151,7 +162,35 @@ def GetInstanceCheckScript():
   """Returns path to instance check script or C{None}.
 
   """
   """Returns path to instance check script or C{None}.
 
   """

-  return cfg.get(_INSTANCE_CHECK_KEY, None)
+  return cfg.get(_INSTANCE_CHECK_KEY, None) # pylint: disable=E1103
+
+
+def GetEnabledHypervisors():
+  """Returns list of enabled hypervisors.
+
+  @rtype: list
+
+  """
+  try:
+    value = cfg[_ENABLED_HV_KEY]
+  except KeyError:
+    return [constants.DEFAULT_ENABLED_HYPERVISOR]
+  else:
+    if isinstance(value, basestring):
+      # The configuration key ("enabled-hypervisors") implies there can be
+      # multiple values. Multiple hypervisors are comma-separated on the
+      # command line option to "gnt-cluster init", so we need to handle them
+      # equally here.
+      return value.split(",")
+    else:
+      return value
+
+
+def GetDefaultHypervisor():
+  """Returns the default hypervisor to be used.
+
+  """
+  return GetEnabledHypervisors()[0]

 
 
 def GetInstanceNicMac(inst, default=None):
 
 
 def GetInstanceNicMac(inst, default=None):