Revision d0c8c01d 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):
|
|
| 40 |
raise qa_error.Error("Node %s already in cluster" % node['primary'])
|
|
| 41 |
elif readd and not node.get('_added', False):
|
|
| 42 |
raise qa_error.Error("Node %s not yet in cluster" % node['primary'])
|
|
| 43 |
|
|
| 44 |
cmd = ['gnt-node', 'add', "--no-ssh-key-check"]
|
|
| 45 |
if node.get('secondary', None):
|
|
| 46 |
cmd.append('--secondary-ip=%s' % node['secondary'])
|
|
| 39 |
if not readd and node.get("_added", False):
|
|
| 40 |
raise qa_error.Error("Node %s already in cluster" % node["primary"])
|
|
| 41 |
elif readd and not node.get("_added", False):
|
|
| 42 |
raise qa_error.Error("Node %s not yet in cluster" % node["primary"])
|
|
| 43 |
|
|
| 44 |
cmd = ["gnt-node", "add", "--no-ssh-key-check"]
|
|
| 45 |
if node.get("secondary", None):
|
|
| 46 |
cmd.append("--secondary-ip=%s" % node["secondary"])
|
|
| 47 | 47 |
if readd: |
| 48 |
cmd.append('--readd')
|
|
| 49 |
cmd.append(node['primary'])
|
|
| 48 |
cmd.append("--readd")
|
|
| 49 |
cmd.append(node["primary"])
|
|
| 50 | 50 |
|
| 51 | 51 |
AssertCommand(cmd) |
| 52 | 52 |
|
| 53 |
node['_added'] = True
|
|
| 53 |
node["_added"] = True
|
|
| 54 | 54 |
|
| 55 | 55 |
|
| 56 | 56 |
def _NodeRemove(node): |
| 57 | 57 |
AssertCommand(["gnt-node", "remove", node["primary"]]) |
| 58 |
node['_added'] = False
|
|
| 58 |
node["_added"] = False
|
|
| 59 | 59 |
|
| 60 | 60 |
|
| 61 | 61 |
def TestNodeAddAll(): |
| 62 | 62 |
"""Adding all nodes to cluster.""" |
| 63 | 63 |
master = qa_config.GetMasterNode() |
| 64 |
for node in qa_config.get('nodes'):
|
|
| 64 |
for node in qa_config.get("nodes"):
|
|
| 65 | 65 |
if node != master: |
| 66 | 66 |
_NodeAdd(node, readd=False) |
| 67 | 67 |
|
| ... | ... | |
| 73 | 73 |
|
| 74 | 74 |
""" |
| 75 | 75 |
master = qa_config.GetMasterNode() |
| 76 |
for node in qa_config.get('nodes'):
|
|
| 76 |
for node in qa_config.get("nodes"):
|
|
| 77 | 77 |
if node != master: |
| 78 |
node['_added'] = True
|
|
| 78 |
node["_added"] = True
|
|
| 79 | 79 |
|
| 80 | 80 |
|
| 81 | 81 |
def TestNodeRemoveAll(): |
| 82 | 82 |
"""Removing all nodes from cluster.""" |
| 83 | 83 |
master = qa_config.GetMasterNode() |
| 84 |
for node in qa_config.get('nodes'):
|
|
| 84 |
for node in qa_config.get("nodes"):
|
|
| 85 | 85 |
if node != master: |
| 86 | 86 |
_NodeRemove(node) |
| 87 | 87 |
|
Also available in: Unified diff