Revision b337aeb4
| b/qa/qa_node.py | ||
|---|---|---|
| 35 | 35 |
from qa_utils import AssertCommand, AssertEqual |
| 36 | 36 |
|
| 37 | 37 |
|
| 38 |
def _NodeAdd(node, readd=False):
|
|
| 38 |
def NodeAdd(node, readd=False, group=None):
|
|
| 39 | 39 |
if not readd and node.added: |
| 40 | 40 |
raise qa_error.Error("Node %s already in cluster" % node.primary)
|
| 41 | 41 |
elif readd and not node.added: |
| ... | ... | |
| 46 | 46 |
cmd.append("--secondary-ip=%s" % node.secondary)
|
| 47 | 47 |
if readd: |
| 48 | 48 |
cmd.append("--readd")
|
| 49 |
if group is not None: |
|
| 50 |
cmd.extend(["--node-group", group]) |
|
| 49 | 51 |
cmd.append(node.primary) |
| 50 | 52 |
|
| 51 | 53 |
AssertCommand(cmd) |
| ... | ... | |
| 56 | 58 |
node.MarkAdded() |
| 57 | 59 |
|
| 58 | 60 |
|
| 59 |
def _NodeRemove(node):
|
|
| 61 |
def NodeRemove(node): |
|
| 60 | 62 |
AssertCommand(["gnt-node", "remove", node.primary]) |
| 61 | 63 |
node.MarkRemoved() |
| 62 | 64 |
|
| ... | ... | |
| 72 | 74 |
master = qa_config.GetMasterNode() |
| 73 | 75 |
for node in qa_config.get("nodes"):
|
| 74 | 76 |
if node != master: |
| 75 |
_NodeAdd(node, readd=False)
|
|
| 77 |
NodeAdd(node, readd=False) |
|
| 76 | 78 |
|
| 77 | 79 |
|
| 78 | 80 |
def MarkNodeAddedAll(): |
| ... | ... | |
| 92 | 94 |
master = qa_config.GetMasterNode() |
| 93 | 95 |
for node in qa_config.get("nodes"):
|
| 94 | 96 |
if node != master: |
| 95 |
_NodeRemove(node)
|
|
| 97 |
NodeRemove(node) |
|
| 96 | 98 |
|
| 97 | 99 |
|
| 98 | 100 |
def TestNodeReadd(node): |
| 99 | 101 |
"""gnt-node add --readd""" |
| 100 |
_NodeAdd(node, readd=True)
|
|
| 102 |
NodeAdd(node, readd=True) |
|
| 101 | 103 |
|
| 102 | 104 |
|
| 103 | 105 |
def TestNodeInfo(): |
Also available in: Unified diff