Revision 7d7609a3

b/qa/ganeti-qa.py
269 269
      RunTest(qa_instance.TestInstanceRemove, instance)
270 270
      del instance
271 271

  
272
    if qa_config.TestEnabled('instance-add-remote-raid-disk'):
273
      snode = qa_config.AcquireNode(exclude=pnode)
274
      try:
275
        instance = RunTest(qa_instance.TestInstanceAddWithRemoteRaidDisk,
276
                           pnode, snode)
277
        RunCommonInstanceTests(instance)
278
        RunExportImportTests(instance, pnode)
279
        RunHardwareFailureTests(instance, pnode, snode)
280
        RunTest(qa_instance.TestInstanceRemove, instance)
281
        del instance
282
      finally:
283
        qa_config.ReleaseNode(snode)
272
    multinode_tests = [
273
      ('instance-add-remote-raid-disk',
274
       qa_instance.TestInstanceAddWithRemoteRaidDisk),
275
      ('instance-add-drbd-disk',
276
       qa_instance.TestInstanceAddWithDrbdDisk),
277
    ]
278

  
279
    for name, func in multinode_tests:
280
      if qa_config.TestEnabled(name):
281
        snode = qa_config.AcquireNode(exclude=pnode)
282
        try:
283
          instance = RunTest(func, pnode, snode)
284
          RunCommonInstanceTests(instance)
285
          RunExportImportTests(instance, pnode)
286
          RunHardwareFailureTests(instance, pnode, snode)
287
          RunTest(qa_instance.TestInstanceRemove, instance)
288
          del instance
289
        finally:
290
          qa_config.ReleaseNode(snode)
284 291

  
285 292
  finally:
286 293
    qa_config.ReleaseNode(pnode)
b/qa/qa-sample.yaml
48 48
  instance-add-plain-disk: True
49 49
  instance-add-local-mirror-disk: True
50 50
  instance-add-remote-raid-disk: True
51
  instance-add-drbd-disk: False
51 52
  instance-list: True
52 53
  instance-failover: True
53 54
  instance-info: True
b/qa/qa_instance.py
82 82
                   'remote_raid1')
83 83

  
84 84

  
85
@qa_utils.DefineHook('instance-add-drbd-disk')
86
def TestInstanceAddWithDrbdDisk(node, node2):
87
  """gnt-instance add -t drbd"""
88
  return _DiskTest("%s:%s" % (node['primary'], node2['primary']),
89
                   'drbd')
90

  
91

  
85 92
@qa_utils.DefineHook('instance-remove')
86 93
def TestInstanceRemove(instance):
87 94
  """gnt-instance remove"""

Also available in: Unified diff