Revision 113b8d89
b/qa/qa_instance.py | ||
---|---|---|
43 | 43 |
'--memory=%s' % qa_config.get('mem')] |
44 | 44 |
|
45 | 45 |
|
46 |
def _DiskTest(node, args):
|
|
46 |
def _DiskTest(node, disk_template):
|
|
47 | 47 |
master = qa_config.GetMasterNode() |
48 | 48 |
|
49 | 49 |
instance = qa_config.AcquireInstance() |
50 | 50 |
try: |
51 | 51 |
cmd = (['gnt-instance', 'add', |
52 | 52 |
'--os-type=%s' % qa_config.get('os'), |
53 |
'--node=%s' % node['primary']] + |
|
53 |
'--disk-template=%s' % disk_template, |
|
54 |
'--node=%s' % node] + |
|
54 | 55 |
_GetGenericAddParameters()) |
55 |
if args: |
|
56 |
cmd += args |
|
57 | 56 |
cmd.append(instance['name']) |
58 | 57 |
|
59 | 58 |
AssertEqual(StartSSH(master['primary'], |
... | ... | |
66 | 65 |
|
67 | 66 |
def TestInstanceAddWithPlainDisk(node): |
68 | 67 |
"""gnt-instance add -t plain""" |
69 |
return _DiskTest(node, ['--disk-template=plain'])
|
|
68 |
return _DiskTest(node['primary'], 'plain')
|
|
70 | 69 |
|
71 | 70 |
|
72 | 71 |
def TestInstanceAddWithLocalMirrorDisk(node): |
73 | 72 |
"""gnt-instance add -t local_raid1""" |
74 |
return _DiskTest(node, ['--disk-template=local_raid1'])
|
|
73 |
return _DiskTest(node['primary'], 'local_raid1')
|
|
75 | 74 |
|
76 | 75 |
|
77 | 76 |
def TestInstanceAddWithRemoteRaidDisk(node, node2): |
78 | 77 |
"""gnt-instance add -t remote_raid1""" |
79 |
return _DiskTest(node, |
|
80 |
['--disk-template=remote_raid1', |
|
81 |
'--secondary-node=%s' % node2['primary']]) |
|
78 |
return _DiskTest("%s:%s" % (node['primary'], node2['primary']), |
|
79 |
'remote_raid1') |
|
82 | 80 |
|
83 | 81 |
|
84 | 82 |
def TestInstanceRemove(instance): |
Also available in: Unified diff