Revision e8b919a1
b/qa/ganeti-qa.py | ||
---|---|---|
464 | 464 |
|
465 | 465 |
node = qa_config.AcquireNode() |
466 | 466 |
try: |
467 |
old_es = qa_cluster.TestSetExclStorCluster(True) |
|
467 |
old_es = qa_cluster.TestSetExclStorCluster(False) |
|
468 |
qa_cluster.TestExclStorSingleNode(node) |
|
469 |
|
|
470 |
qa_cluster.TestSetExclStorCluster(True) |
|
468 | 471 |
if qa_config.TestEnabled("instance-add-plain-disk"): |
469 | 472 |
# Make sure that the cluster doesn't have any pre-existing problem |
470 | 473 |
qa_cluster.AssertClusterVerify() |
b/qa/qa_cluster.py | ||
---|---|---|
645 | 645 |
raise qa_error.Error("exclusive_storage has the wrong value: %s instead" |
646 | 646 |
" of %s" % (effvalue, newvalue)) |
647 | 647 |
return oldvalue |
648 |
|
|
649 |
|
|
650 |
def _BuildSetESCmd(value, node_name): |
|
651 |
return ["gnt-node", "modify", "--node-parameters", |
|
652 |
"exclusive_storage=%s" % value, node_name] |
|
653 |
|
|
654 |
|
|
655 |
def TestExclStorSingleNode(node): |
|
656 |
"""cluster-verify reports exclusive_storage set only on one node. |
|
657 |
|
|
658 |
""" |
|
659 |
node_name = node["primary"] |
|
660 |
es_val = _GetBoolClusterField("exclusive_storage") |
|
661 |
assert not es_val |
|
662 |
AssertCommand(_BuildSetESCmd(True, node_name)) |
|
663 |
AssertClusterVerify(fail=True, errors=[constants.CV_EGROUPMIXEDESFLAG]) |
|
664 |
AssertCommand(_BuildSetESCmd("default", node_name)) |
|
665 |
AssertClusterVerify() |
Also available in: Unified diff