Revision 2dae8d64 qa/qa_config.py

b/qa/qa_config.py
38 38
_ENABLED_HV_KEY = "enabled-hypervisors"
39 39
_VCLUSTER_MASTER_KEY = "vcluster-master"
40 40
_VCLUSTER_BASEDIR_KEY = "vcluster-basedir"
41
_ENABLED_STORAGE_TYPES_KEY = "enabled-storage-types"
41
_ENABLED_DISK_TEMPLATES_KEY = "enabled-disk-templates"
42 42

  
43 43
#: QA configuration (L{_QaConfig})
44 44
_config = None
......
360 360
    """
361 361
    return self.GetEnabledHypervisors()[0]
362 362

  
363
  def GetEnabledStorageTypes(self):
364
    """Returns the list of enabled storage types.
363
  def GetEnabledDiskTemplates(self):
364
    """Returns the list of enabled disk templates.
365 365

  
366 366
    @rtype: list
367 367

  
368 368
    """
369 369
    return self._GetStringListParameter(
370
      _ENABLED_STORAGE_TYPES_KEY,
371
      list(constants.DEFAULT_ENABLED_STORAGE_TYPES))
370
      _ENABLED_DISK_TEMPLATES_KEY,
371
      list(constants.DEFAULT_ENABLED_DISK_TEMPLATES))
372 372

  
373
  def GetDefaultStorageType(self):
374
    """Returns the default storage type to be used.
373
  def GetDefaultDiskTemplate(self):
374
    """Returns the default disk template to be used.
375 375

  
376 376
    """
377
    return self.GetEnabledStorageTypes()[0]
377
    return self.GetEnabledDiskTemplates()[0]
378 378

  
379 379
  def _GetStringListParameter(self, key, default_values):
380 380
    """Retrieves a parameter's value that is supposed to be a list of strings.
......
551 551
  return GetConfig().GetDefaultHypervisor(*args)
552 552

  
553 553

  
554
def GetEnabledStorageTypes(*args):
555
  """Wrapper for L{_QaConfig.GetEnabledStorageTypes}.
554
def GetEnabledDiskTemplates(*args):
555
  """Wrapper for L{_QaConfig.GetEnabledDiskTemplates}.
556 556

  
557 557
  """
558
  return GetConfig().GetEnabledStorageTypes(*args)
558
  return GetConfig().GetEnabledDiskTemplates(*args)
559 559

  
560 560

  
561
def GetDefaultStorageType(*args):
562
  """Wrapper for L{_QaConfig.GetDefaultStorageType}.
561
def GetDefaultDiskTemplate(*args):
562
  """Wrapper for L{_QaConfig.GetDefaultDiskTemplate}.
563 563

  
564 564
  """
565
  return GetConfig().GetDefaultStorageType(*args)
565
  return GetConfig().GetDefaultDiskTemplate(*args)
566 566

  
567 567

  
568 568
def GetMasterNode():

Also available in: Unified diff