Revision 3601d488
| b/qa/qa-sample.json | ||
|---|---|---|
| 1 | 1 |
{
|
| 2 |
"# Note:": null, |
|
| 3 |
"# This file is stored in the JSON format and does not support": null, |
|
| 4 |
"# comments. As a work-around, comments are keys starting with a hash": null, |
|
| 5 |
"# sign (#).": null, |
|
| 6 |
|
|
| 2 | 7 |
"name": "xen-test", |
| 3 | 8 |
"rename": "xen-test-rename", |
| 4 | 9 |
"enabled-hypervisors": "xen-pvm", |
| ... | ... | |
| 12 | 17 |
"os-hvp": {},
|
| 13 | 18 |
"primary_ip_version": 4, |
| 14 | 19 |
|
| 20 |
"# Network interface for master role": null, |
|
| 21 |
"#master-netdev": "xen-br0", |
|
| 22 |
|
|
| 23 |
"# Default network interface parameters": null, |
|
| 24 |
"#default-nicparams": {
|
|
| 25 |
"mode": "bridged", |
|
| 26 |
"link": "xen-br0", |
|
| 27 |
}, |
|
| 28 |
|
|
| 15 | 29 |
"os": "debian-etch", |
| 16 | 30 |
"maxmem": "1024M", |
| 17 | 31 |
"minmem": "512M", |
| b/qa/qa_cluster.py | ||
|---|---|---|
| 105 | 105 |
"nic-count"): |
| 106 | 106 |
for spec_val in ("min", "max", "std"):
|
| 107 | 107 |
spec = qa_config.get("ispec_%s_%s" %
|
| 108 |
(spec_type.replace('-', '_'), spec_val), None)
|
|
| 108 |
(spec_type.replace("-", "_"), spec_val), None)
|
|
| 109 | 109 |
if spec: |
| 110 | 110 |
cmd.append("--specs-%s=%s=%d" % (spec_type, spec_val, spec))
|
| 111 | 111 |
|
| 112 | 112 |
if master.get("secondary", None):
|
| 113 | 113 |
cmd.append("--secondary-ip=%s" % master["secondary"])
|
| 114 | 114 |
|
| 115 |
bridge = qa_config.get("bridge", None)
|
|
| 116 |
if bridge: |
|
| 117 |
cmd.append("--master-netdev=%s" % bridge)
|
|
| 115 |
master_netdev = qa_config.get("master-netdev", None)
|
|
| 116 |
if master_netdev: |
|
| 117 |
cmd.append("--master-netdev=%s" % master_netdev)
|
|
| 118 |
|
|
| 119 |
nicparams = qa_config.get("default-nicparams", None)
|
|
| 120 |
if nicparams: |
|
| 121 |
cmd.append("--nic-parameters=%s" %
|
|
| 122 |
",".join(utils.FormatKeyValue(nicparams))) |
|
| 118 | 123 |
|
| 119 | 124 |
cmd.append(qa_config.get("name"))
|
| 120 | 125 |
AssertCommand(cmd) |
Also available in: Unified diff