Revision f9b76ed4 qa/qa_instance.py

b/qa/qa_instance.py
277 277

  
278 278

  
279 279
@InstanceCheck(None, INST_UP, RETURN_VALUE)
280
def TestInstanceAddSharedFile(nodes):
281
  """gnt-instance add -t sharedfile"""
282
  assert len(nodes) == 1
283
  if constants.DT_SHARED_FILE in qa_config.GetEnabledDiskTemplates():
284
    return CreateInstanceByDiskTemplateOneNode(nodes, constants.DT_SHARED_FILE)
285

  
286

  
287
@InstanceCheck(None, INST_UP, RETURN_VALUE)
280 288
def TestInstanceAddDiskless(nodes):
281 289
  """gnt-instance add -t diskless"""
282 290
  assert len(nodes) == 1
......
915 923
def TestInstanceExport(instance, node):
916 924
  """gnt-backup export -n ..."""
917 925
  name = instance.name
926
  # Export does not work for file-based templates, thus we skip the test
927
  if instance.disk_template in [constants.DT_FILE, constants.DT_SHARED_FILE]:
928
    return
918 929
  AssertCommand(["gnt-backup", "export", "-n", node.primary, name])
919 930
  return qa_utils.ResolveInstanceName(name)
920 931

  
......
936 947
def TestInstanceImport(newinst, node, expnode, name):
937 948
  """gnt-backup import"""
938 949
  templ = constants.DT_PLAIN
950
  if not qa_config.IsTemplateSupported(templ):
951
    return
939 952
  cmd = (["gnt-backup", "import",
940 953
          "--disk-template=%s" % templ,
941 954
          "--no-ip-check",

Also available in: Unified diff