Revision 7f69aabb
b/qa/ganeti-qa.py | ||
---|---|---|
317 | 317 |
try: |
318 | 318 |
instance = RunTest(func, pnode, snode) |
319 | 319 |
RunCommonInstanceTests(instance) |
320 |
if qa_config.TestEnabled('instance-convert-disk'): |
|
321 |
RunTest(qa_instance.TestInstanceConvertDisk, instance, snode) |
|
320 | 322 |
RunExportImportTests(instance, pnode) |
321 | 323 |
RunHardwareFailureTests(instance, pnode, snode) |
322 | 324 |
RunTest(qa_instance.TestInstanceRemove, instance) |
b/qa/qa-sample.json | ||
---|---|---|
62 | 62 |
|
63 | 63 |
"instance-add-plain-disk": true, |
64 | 64 |
"instance-add-drbd-disk": true, |
65 |
"instance-convert-disk": true, |
|
65 | 66 |
|
66 | 67 |
"instance-automatic-restart": false, |
67 | 68 |
"instance-consecutive-failures": false, |
b/qa/qa_instance.py | ||
---|---|---|
209 | 209 |
utils.ShellQuoteArgs(cmd)).wait(), 0) |
210 | 210 |
|
211 | 211 |
|
212 |
def TestInstanceConvertDisk(instance, snode): |
|
213 |
"""gnt-instance modify -t""" |
|
214 |
master = qa_config.GetMasterNode() |
|
215 |
cmd = ['gnt-instance', 'modify', '-t', 'plain', instance['name']] |
|
216 |
AssertEqual(StartSSH(master['primary'], |
|
217 |
utils.ShellQuoteArgs(cmd)).wait(), 0) |
|
218 |
cmd = ['gnt-instance', 'modify', '-t', 'drbd', '-n', snode, instance['name']] |
|
219 |
AssertEqual(StartSSH(master['primary'], |
|
220 |
utils.ShellQuoteArgs(cmd)).wait(), 0) |
|
221 |
|
|
222 |
|
|
212 | 223 |
def TestInstanceList(): |
213 | 224 |
"""gnt-instance list""" |
214 | 225 |
master = qa_config.GetMasterNode() |
Also available in: Unified diff