Revision 2c4f480d
b/qa/qa_monitoring.py | ||
---|---|---|
40 | 40 |
|
41 | 41 |
""" |
42 | 42 |
enabled_hypervisors = qa_config.GetEnabledHypervisors() |
43 |
|
|
43 | 44 |
is_xen = (constants.HT_XEN_PVM in enabled_hypervisors or |
44 | 45 |
constants.HT_XEN_HVM in enabled_hypervisors) |
45 |
fail = not is_xen |
|
46 |
if not is_xen: |
|
47 |
return |
|
46 | 48 |
|
47 | 49 |
# Execute on master on an empty cluster |
48 |
AssertCommand([MON_COLLECTOR, "inst-status-xen"], fail=fail)
|
|
50 |
AssertCommand([MON_COLLECTOR, "inst-status-xen"]) |
|
49 | 51 |
|
50 | 52 |
#Execute on cluster with instances |
51 | 53 |
node1 = qa_config.AcquireNode() |
... | ... | |
53 | 55 |
template = qa_config.GetDefaultDiskTemplate() |
54 | 56 |
|
55 | 57 |
instance = CreateInstanceByDiskTemplate([node1, node2], template) |
56 |
AssertCommand([MON_COLLECTOR, "inst-status-xen"], node=node1, fail=fail)
|
|
57 |
AssertCommand([MON_COLLECTOR, "inst-status-xen"], node=node2, fail=fail)
|
|
58 |
AssertCommand([MON_COLLECTOR, "inst-status-xen"], node=node1) |
|
59 |
AssertCommand([MON_COLLECTOR, "inst-status-xen"], node=node2) |
|
58 | 60 |
RemoveInstance(instance) |
59 | 61 |
|
60 | 62 |
node1.Release() |
Also available in: Unified diff