Revision 8e671b7c
| b/qa/ganeti-qa.py | ||
|---|---|---|
| 77 | 77 |
if qa_config.TestEnabled('create-cluster'):
|
| 78 | 78 |
RunTest(qa_cluster.TestClusterInit) |
| 79 | 79 |
RunTest(qa_node.TestNodeAddAll) |
| 80 |
else: |
|
| 81 |
# consider the nodes are already there |
|
| 82 |
qa_node.MarkNodeAddedAll() |
|
| 80 | 83 |
if qa_config.TestEnabled('node-info'):
|
| 81 | 84 |
RunTest(qa_node.TestNodeInfo) |
| 82 | 85 |
|
| b/qa/qa_node.py | ||
|---|---|---|
| 66 | 66 |
_NodeAdd(node, readd=False) |
| 67 | 67 |
|
| 68 | 68 |
|
| 69 |
def MarkNodeAddedAll(): |
|
| 70 |
"""Mark all nodes as added. |
|
| 71 |
|
|
| 72 |
This is useful if we don't create the cluster ourselves (in qa). |
|
| 73 |
|
|
| 74 |
""" |
|
| 75 |
master = qa_config.GetMasterNode() |
|
| 76 |
for node in qa_config.get('nodes'):
|
|
| 77 |
if node != master: |
|
| 78 |
node['_added'] = True |
|
| 79 |
|
|
| 80 |
|
|
| 69 | 81 |
def TestNodeRemoveAll(): |
| 70 | 82 |
"""Removing all nodes from cluster.""" |
| 71 | 83 |
master = qa_config.GetMasterNode() |
Also available in: Unified diff