Revision dbdb0594 qa/qa_node.py
| b/qa/qa_node.py | ||
|---|---|---|
| 36 | 36 |
|
| 37 | 37 |
|
| 38 | 38 |
def _NodeAdd(node, readd=False): |
| 39 |
if not readd and node.get("_added", False):
|
|
| 39 |
if not readd and node.added:
|
|
| 40 | 40 |
raise qa_error.Error("Node %s already in cluster" % node["primary"])
|
| 41 |
elif readd and not node.get("_added", False):
|
|
| 41 |
elif readd and not node.added:
|
|
| 42 | 42 |
raise qa_error.Error("Node %s not yet in cluster" % node["primary"])
|
| 43 | 43 |
|
| 44 | 44 |
cmd = ["gnt-node", "add", "--no-ssh-key-check"] |
| ... | ... | |
| 50 | 50 |
|
| 51 | 51 |
AssertCommand(cmd) |
| 52 | 52 |
|
| 53 |
node["_added"] = True |
|
| 53 |
if readd: |
|
| 54 |
assert node.added |
|
| 55 |
else: |
|
| 56 |
node.MarkAdded() |
|
| 54 | 57 |
|
| 55 | 58 |
|
| 56 | 59 |
def _NodeRemove(node): |
| 57 | 60 |
AssertCommand(["gnt-node", "remove", node["primary"]]) |
| 58 |
node["_added"] = False
|
|
| 61 |
node.MarkRemoved()
|
|
| 59 | 62 |
|
| 60 | 63 |
|
| 61 | 64 |
def MakeNodeOffline(node, value): |
| ... | ... | |
| 81 | 84 |
master = qa_config.GetMasterNode() |
| 82 | 85 |
for node in qa_config.get("nodes"):
|
| 83 | 86 |
if node != master: |
| 84 |
node["_added"] = True
|
|
| 87 |
node.MarkAdded()
|
|
| 85 | 88 |
|
| 86 | 89 |
|
| 87 | 90 |
def TestNodeRemoveAll(): |
Also available in: Unified diff