Revision a5b9d725
| b/lib/rapi/rlib2.py | ||
|---|---|---|
| 35 | 35 |
"disk_template", |
| 36 | 36 |
"nic.ips", "nic.macs", "nic.bridges", |
| 37 | 37 |
"disk.sizes", |
| 38 |
"beparams", |
|
| 38 |
"beparams", "hvparams",
|
|
| 39 | 39 |
"oper_state", "oper_ram", "status", |
| 40 | 40 |
"tags"] |
| 41 | 41 |
|
| b/qa/ganeti-qa.py | ||
|---|---|---|
| 74 | 74 |
"""Initializes the cluster. |
| 75 | 75 |
|
| 76 | 76 |
""" |
| 77 |
RunTest(qa_cluster.TestClusterInit) |
|
| 78 |
RunTest(qa_node.TestNodeAddAll) |
|
| 77 |
if qa_config.TestEnabled('create-cluster'):
|
|
| 78 |
RunTest(qa_cluster.TestClusterInit) |
|
| 79 |
RunTest(qa_node.TestNodeAddAll) |
|
| 79 | 80 |
if qa_config.TestEnabled('node-info'):
|
| 80 | 81 |
RunTest(qa_node.TestNodeInfo) |
| 81 | 82 |
|
| ... | ... | |
| 308 | 309 |
finally: |
| 309 | 310 |
qa_config.ReleaseNode(pnode) |
| 310 | 311 |
|
| 311 |
RunTest(qa_node.TestNodeRemoveAll) |
|
| 312 |
if qa_config.TestEnabled('create-cluster'):
|
|
| 313 |
RunTest(qa_node.TestNodeRemoveAll) |
|
| 312 | 314 |
|
| 313 | 315 |
if qa_config.TestEnabled('cluster-destroy'):
|
| 314 | 316 |
RunTest(qa_cluster.TestClusterDestroy) |
| b/qa/qa-sample.json | ||
|---|---|---|
| 38 | 38 |
"tags": true, |
| 39 | 39 |
"rapi": true, |
| 40 | 40 |
|
| 41 |
"create-cluster": true, |
|
| 41 | 42 |
"cluster-verify": true, |
| 42 | 43 |
"cluster-info": true, |
| 43 | 44 |
"cluster-burnin": true, |
| b/qa/qa_rapi.py | ||
|---|---|---|
| 41 | 41 |
|
| 42 | 42 |
|
| 43 | 43 |
INSTANCE_FIELDS = ("name", "os", "pnode", "snodes",
|
| 44 |
"admin_state", "admin_ram", |
|
| 45 |
"disk_template", "ip", "mac", "bridge", |
|
| 46 |
"sda_size", "sdb_size", "vcpus", |
|
| 47 |
"oper_state", "status", "tags") |
|
| 44 |
"admin_state", |
|
| 45 |
"disk_template", "disk.sizes", |
|
| 46 |
"nic.ips", "nic.macs", "nic.bridges", |
|
| 47 |
"beparams", "hvparams", |
|
| 48 |
"oper_state", "oper_ram", "status", "tags") |
|
| 48 | 49 |
|
| 49 | 50 |
NODE_FIELDS = ("name", "dtotal", "dfree",
|
| 50 | 51 |
"mtotal", "mnode", "mfree", |
| ... | ... | |
| 119 | 120 |
|
| 120 | 121 |
def _VerifyNodes(data): |
| 121 | 122 |
master_entry = {
|
| 122 |
"name": master_name,
|
|
| 123 |
"uri": "/nodes/%s" % master_name, |
|
| 123 |
"id": master_name,
|
|
| 124 |
"uri": "/2/nodes/%s" % master_name,
|
|
| 124 | 125 |
} |
| 125 | 126 |
AssertIn(master_entry, data) |
| 126 | 127 |
|
| ... | ... | |
| 131 | 132 |
|
| 132 | 133 |
_DoTests([ |
| 133 | 134 |
("/", None),
|
| 134 |
("/info", _VerifyInfo),
|
|
| 135 |
("/tags", None),
|
|
| 136 |
("/nodes", _VerifyNodes),
|
|
| 137 |
("/nodes?bulk=1", _VerifyNodesBulk),
|
|
| 138 |
("/instances", []),
|
|
| 139 |
("/instances?bulk=1", []),
|
|
| 140 |
("/os", None),
|
|
| 135 |
("/2/info", _VerifyInfo),
|
|
| 136 |
("/2/tags", None),
|
|
| 137 |
("/2/nodes", _VerifyNodes),
|
|
| 138 |
("/2/nodes?bulk=1", _VerifyNodesBulk),
|
|
| 139 |
("/2/instances", []),
|
|
| 140 |
("/2/instances?bulk=1", []),
|
|
| 141 |
("/2/os", None),
|
|
| 141 | 142 |
]) |
| 142 | 143 |
|
| 143 | 144 |
|
| ... | ... | |
| 159 | 160 |
_VerifyInstance(instance_data) |
| 160 | 161 |
|
| 161 | 162 |
_DoTests([ |
| 162 |
("/instances/%s" % instance["name"], _VerifyInstance),
|
|
| 163 |
("/instances", _VerifyInstancesList),
|
|
| 164 |
("/instances?bulk=1", _VerifyInstancesBulk),
|
|
| 163 |
("/2/instances/%s" % instance["name"], _VerifyInstance),
|
|
| 164 |
("/2/instances", _VerifyInstancesList),
|
|
| 165 |
("/2/instances?bulk=1", _VerifyInstancesBulk),
|
|
| 165 | 166 |
]) |
| 166 | 167 |
|
| 167 | 168 |
|
| ... | ... | |
| 183 | 184 |
_VerifyNode(node_data) |
| 184 | 185 |
|
| 185 | 186 |
_DoTests([ |
| 186 |
("/nodes/%s" % node["primary"], _VerifyNode),
|
|
| 187 |
("/nodes", _VerifyNodesList),
|
|
| 188 |
("/nodes?bulk=1", _VerifyNodesBulk),
|
|
| 187 |
("/2/nodes/%s" % node["primary"], _VerifyNode),
|
|
| 188 |
("/2/nodes", _VerifyNodesList),
|
|
| 189 |
("/2/nodes?bulk=1", _VerifyNodesBulk),
|
|
| 189 | 190 |
]) |
| 190 | 191 |
|
| 191 | 192 |
|
| ... | ... | |
| 194 | 195 |
|
| 195 | 196 |
""" |
| 196 | 197 |
if kind == constants.TAG_CLUSTER: |
| 197 |
uri = "/tags" |
|
| 198 |
uri = "/2/tags"
|
|
| 198 | 199 |
elif kind == constants.TAG_NODE: |
| 199 |
uri = "/nodes/%s/tags" % name |
|
| 200 |
uri = "/2/nodes/%s/tags" % name
|
|
| 200 | 201 |
elif kind == constants.TAG_INSTANCE: |
| 201 |
uri = "/instances/%s/tags" % name |
|
| 202 |
uri = "/2/instances/%s/tags" % name
|
|
| 202 | 203 |
else: |
| 203 | 204 |
raise errors.ProgrammerError("Unknown tag kind")
|
| 204 | 205 |
|
Also available in: Unified diff