Revision 732052c1 qa/qa_os.py
| b/qa/qa_os.py | ||
|---|---|---|
| 81 | 81 |
AssertCommand(new_cmd) |
| 82 | 82 |
|
| 83 | 83 |
|
| 84 |
def _SetupTempOs(node, dirname, valid): |
|
| 84 |
def _SetupTempOs(node, dirname, variant, valid):
|
|
| 85 | 85 |
"""Creates a temporary OS definition on the given node. |
| 86 | 86 |
|
| 87 | 87 |
""" |
| ... | ... | |
| 102 | 102 |
parts.append(sq(["echo", str(constants.OS_API_V20)]) + |
| 103 | 103 |
" >ganeti_api_version") |
| 104 | 104 |
|
| 105 |
parts.append(sq(["echo", "default"]) + " >variants.list")
|
|
| 105 |
parts.append(sq(["echo", variant]) + " >variants.list")
|
|
| 106 | 106 |
parts.append(sq(["echo", "funny this is funny"]) + " >parameters.list") |
| 107 | 107 |
|
| 108 | 108 |
cmd = " && ".join(parts) |
| ... | ... | |
| 128 | 128 |
master = qa_config.GetMasterNode() |
| 129 | 129 |
|
| 130 | 130 |
name = _TEMP_OS_NAME |
| 131 |
variant = "default" |
|
| 132 |
fullname = "%s+%s" % (name, variant) |
|
| 131 | 133 |
dirname = _TEMP_OS_PATH |
| 132 | 134 |
|
| 133 | 135 |
# Ensure OS is usable |
| ... | ... | |
| 146 | 148 |
valid = bool(i % 2) |
| 147 | 149 |
else: |
| 148 | 150 |
raise AssertionError("Unknown mode %s" % mode)
|
| 149 |
_SetupTempOs(node, dirname, valid) |
|
| 151 |
_SetupTempOs(node, dirname, variant, valid)
|
|
| 150 | 152 |
|
| 151 | 153 |
# TODO: Use Python 2.6's itertools.permutations |
| 152 | 154 |
for (hidden, blacklisted) in [(False, False), (True, False), |
| ... | ... | |
| 192 | 194 |
assert_fn = AssertIn |
| 193 | 195 |
else: |
| 194 | 196 |
assert_fn = AssertNotIn |
| 195 |
assert_fn(name, output.splitlines()) |
|
| 197 |
assert_fn(fullname, output.splitlines())
|
|
| 196 | 198 |
|
| 197 | 199 |
# Check via RAPI |
| 198 | 200 |
if rapi_cb: |
| 199 |
assert_fn(name, rapi_cb()) |
|
| 201 |
assert_fn(fullname, rapi_cb())
|
|
| 200 | 202 |
finally: |
| 201 | 203 |
for node in nodes: |
| 202 | 204 |
_RemoveTempOs(node, dirname) |
Also available in: Unified diff