Revision 1e7acc3b
b/lib/client/gnt_cluster.py | ||
---|---|---|
949 | 949 |
opts.prealloc_wipe_disks is not None or |
950 | 950 |
opts.hv_state or |
951 | 951 |
opts.disk_state or |
952 |
opts.ispecs_mem_size is not None or |
|
953 |
opts.ispecs_cpu_count is not None or |
|
954 |
opts.ispecs_disk_count is not None or |
|
955 |
opts.ispecs_disk_size is not None or |
|
956 |
opts.ispecs_nic_count is not None): |
|
952 |
opts.ispecs_mem_size or |
|
953 |
opts.ispecs_cpu_count or |
|
954 |
opts.ispecs_disk_count or |
|
955 |
opts.ispecs_disk_size or |
|
956 |
opts.ispecs_nic_count or |
|
957 |
opts.ipolicy_disk_templates is not None or |
|
958 |
opts.ipolicy_vcpu_ratio is not None): |
|
957 | 959 |
ToStderr("Please give at least one of the parameters.") |
958 | 960 |
return 1 |
959 | 961 |
|
b/qa/ganeti-qa.py | ||
---|---|---|
1 | 1 |
#!/usr/bin/python -u |
2 | 2 |
# |
3 | 3 |
|
4 |
# Copyright (C) 2007, 2008, 2009, 2010, 2011 Google Inc. |
|
4 |
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Google Inc.
|
|
5 | 5 |
# |
6 | 6 |
# This program is free software; you can redistribute it and/or modify |
7 | 7 |
# it under the terms of the GNU General Public License as published by |
... | ... | |
160 | 160 |
("cluster-verify", qa_cluster.TestClusterVerify), |
161 | 161 |
("cluster-reserved-lvs", qa_cluster.TestClusterReservedLvs), |
162 | 162 |
# TODO: add more cluster modify tests |
163 |
("cluster-modify", qa_cluster.TestClusterModifyEmpty), |
|
163 | 164 |
("cluster-modify", qa_cluster.TestClusterModifyBe), |
164 | 165 |
("cluster-modify", qa_cluster.TestClusterModifyDisk), |
165 | 166 |
("cluster-rename", qa_cluster.TestClusterRename), |
b/qa/qa_cluster.py | ||
---|---|---|
1 | 1 |
# |
2 | 2 |
# |
3 | 3 |
|
4 |
# Copyright (C) 2007, 2010, 2011 Google Inc. |
|
4 |
# Copyright (C) 2007, 2010, 2011, 2012 Google Inc.
|
|
5 | 5 |
# |
6 | 6 |
# This program is free software; you can redistribute it and/or modify |
7 | 7 |
# it under the terms of the GNU General Public License as published by |
... | ... | |
276 | 276 |
AssertCommand(cmd, fail=fail) |
277 | 277 |
|
278 | 278 |
|
279 |
def TestClusterModifyEmpty(): |
|
280 |
"""gnt-cluster modify""" |
|
281 |
AssertCommand(["gnt-cluster", "modify"], fail=True) |
|
282 |
|
|
283 |
|
|
279 | 284 |
def TestClusterModifyDisk(): |
280 | 285 |
"""gnt-cluster modify -D""" |
281 | 286 |
for param in _FAIL_PARAMS: |
Also available in: Unified diff