Revision 1d693311 qa/qa_instance.py
| b/qa/qa_instance.py | ||
|---|---|---|
| 41 | 41 |
|
| 42 | 42 |
|
| 43 | 43 |
def _GetGenericAddParameters(): |
| 44 |
return ['--os-size=%s' % qa_config.get('os-size'),
|
|
| 45 |
'--swap-size=%s' % qa_config.get('swap-size'),
|
|
| 46 |
'--memory=%s' % qa_config.get('mem')]
|
|
| 44 |
params = ['-B', '%s=%s' % (constants.BE_MEMORY, qa_config.get('mem'))]
|
|
| 45 |
for idx, size in enumerate(qa_config.get('disk')):
|
|
| 46 |
params.extend(["--disk", "%s:size=%s" % (idx, size)]) |
|
| 47 |
return params |
|
| 47 | 48 |
|
| 48 | 49 |
|
| 49 | 50 |
def _DiskTest(node, disk_template): |
| ... | ... | |
| 153 | 154 |
"""gnt-instance modify""" |
| 154 | 155 |
master = qa_config.GetMasterNode() |
| 155 | 156 |
|
| 157 |
# Assume /sbin/init exists on all systems |
|
| 158 |
test_kernel = "/sbin/init" |
|
| 159 |
test_initrd = test_kernel |
|
| 160 |
|
|
| 156 | 161 |
orig_memory = qa_config.get('mem')
|
| 157 | 162 |
orig_bridge = qa_config.get('bridge', 'xen-br0')
|
| 158 | 163 |
args = [ |
| 159 |
["--memory", "128"], |
|
| 160 |
["--memory", str(orig_memory)], |
|
| 161 |
["--cpu", "2"], |
|
| 162 |
["--cpu", "1"], |
|
| 163 |
["--bridge", "xen-br1"], |
|
| 164 |
["--bridge", orig_bridge], |
|
| 165 |
["--kernel", "/dev/null"], |
|
| 166 |
["--kernel", "default"], |
|
| 167 |
["--initrd", "/dev/null"], |
|
| 168 |
["--initrd", "none"], |
|
| 169 |
["--initrd", "default"], |
|
| 170 |
["--hvm-boot-order", "acn"], |
|
| 171 |
["--hvm-boot-order", "default"], |
|
| 164 |
["-B", "%s=128" % constants.BE_MEMORY], |
|
| 165 |
["-B", "%s=%s" % (constants.BE_MEMORY, orig_memory)], |
|
| 166 |
["-B", "%s=2" % constants.BE_VCPUS], |
|
| 167 |
["-B", "%s=1" % constants.BE_VCPUS], |
|
| 168 |
["-B", "%s=%s" % (constants.BE_VCPUS, constants.VALUE_DEFAULT)], |
|
| 169 |
|
|
| 170 |
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)], |
|
| 171 |
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)], |
|
| 172 |
["-H", "%s=%s" % (constants.HV_INITRD_PATH, test_initrd)], |
|
| 173 |
["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_NONE)], |
|
| 174 |
["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)], |
|
| 175 |
|
|
| 176 |
# TODO: bridge tests |
|
| 177 |
#["--bridge", "xen-br1"], |
|
| 178 |
#["--bridge", orig_bridge], |
|
| 179 |
|
|
| 180 |
# TODO: Do these tests only with xen-hvm |
|
| 181 |
#["-H", "%s=acn" % constants.HV_BOOT_ORDER], |
|
| 182 |
#["-H", "%s=%s" % (constants.HV_BOOT_ORDER, constants.VALUE_DEFAULT)], |
|
| 172 | 183 |
] |
| 173 | 184 |
for alist in args: |
| 174 | 185 |
cmd = ['gnt-instance', 'modify'] + alist + [instance['name']] |
Also available in: Unified diff