Revision 2db04578 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 1806 | 1806 |
|
| 1807 | 1807 |
assert not nimg.os_fail, "Entered _VerifyNodeOS with failed OS rpc?" |
| 1808 | 1808 |
|
| 1809 |
beautify_params = lambda l: ["%s: %s" % (k, v) for (k, v) in l] |
|
| 1809 | 1810 |
for os_name, os_data in nimg.oslist.items(): |
| 1810 | 1811 |
assert os_data, "Empty OS status for OS %s?!" % os_name |
| 1811 | 1812 |
f_path, f_status, f_diag, f_var, f_param, f_api = os_data[0] |
| ... | ... | |
| 1833 | 1834 |
continue |
| 1834 | 1835 |
for kind, a, b in [("API version", f_api, b_api),
|
| 1835 | 1836 |
("variants list", f_var, b_var),
|
| 1836 |
("parameters", f_param, b_param)]:
|
|
| 1837 |
("parameters", beautify_params(f_param),
|
|
| 1838 |
beautify_params(b_param))]: |
|
| 1837 | 1839 |
_ErrorIf(a != b, self.ENODEOS, node, |
| 1838 |
"OS %s %s differs from reference node %s: %s vs. %s",
|
|
| 1840 |
"OS %s for %s differs from reference node %s: [%s] vs. [%s]",
|
|
| 1839 | 1841 |
kind, os_name, base.name, |
| 1840 |
utils.CommaJoin(a), utils.CommaJoin(b))
|
|
| 1842 |
utils.CommaJoin(sorted(a)), utils.CommaJoin(sorted(b)))
|
|
| 1841 | 1843 |
|
| 1842 | 1844 |
# check any missing OSes |
| 1843 | 1845 |
missing = set(base.oslist.keys()).difference(nimg.oslist.keys()) |
Also available in: Unified diff