Revision f380d53c test/py/ganeti.cmdlib_unittest.py
b/test/py/ganeti.cmdlib_unittest.py | ||
---|---|---|
35 | 35 |
from ganeti import mcpu |
36 | 36 |
from ganeti import cmdlib |
37 | 37 |
from ganeti.cmdlib import cluster |
38 |
from ganeti.cmdlib import group |
|
38 | 39 |
from ganeti.cmdlib import common |
39 | 40 |
from ganeti import opcodes |
40 | 41 |
from ganeti import errors |
... | ... | |
210 | 211 |
|
211 | 212 |
# Test first with the existing state. |
212 | 213 |
(new, prev) = \ |
213 |
cmdlib.LUGroupAssignNodes.CheckAssignmentForSplitInstances([],
|
|
214 |
node_data,
|
|
215 |
instance_data)
|
|
214 |
group.LUGroupAssignNodes.CheckAssignmentForSplitInstances([],
|
|
215 |
node_data, |
|
216 |
instance_data) |
|
216 | 217 |
|
217 | 218 |
self.assertEqual([], new) |
218 | 219 |
self.assertEqual(set(["inst3b", "inst3c"]), set(prev)) |
219 | 220 |
|
220 | 221 |
# And now some changes. |
221 | 222 |
(new, prev) = \ |
222 |
cmdlib.LUGroupAssignNodes.CheckAssignmentForSplitInstances([("n1b",
|
|
223 |
"g3")],
|
|
224 |
node_data,
|
|
225 |
instance_data)
|
|
223 |
group.LUGroupAssignNodes.CheckAssignmentForSplitInstances([("n1b",
|
|
224 |
"g3")], |
|
225 |
node_data, |
|
226 |
instance_data) |
|
226 | 227 |
|
227 | 228 |
self.assertEqual(set(["inst1a", "inst1b"]), set(new)) |
228 | 229 |
self.assertEqual(set(["inst3c"]), set(prev)) |
... | ... | |
429 | 430 |
assert iallocator._NEVAC_RESULT(alloc_result) |
430 | 431 |
|
431 | 432 |
lu = _FakeLU() |
432 |
result = cmdlib._LoadNodeEvacResult(lu, alloc_result,
|
|
433 |
result = common._LoadNodeEvacResult(lu, alloc_result,
|
|
433 | 434 |
early_release, use_nodes) |
434 | 435 |
|
435 | 436 |
if moved: |
... | ... | |
458 | 459 |
assert iallocator._NEVAC_RESULT(alloc_result) |
459 | 460 |
|
460 | 461 |
lu = _FakeLU() |
461 |
self.assertRaises(errors.OpExecError, cmdlib._LoadNodeEvacResult,
|
|
462 |
self.assertRaises(errors.OpExecError, common._LoadNodeEvacResult,
|
|
462 | 463 |
lu, alloc_result, False, False) |
463 | 464 |
self.assertFalse(lu.info_log) |
464 | 465 |
(_, (args, )) = lu.warning_log.pop(0) |
Also available in: Unified diff