Revision 5eacbcae lib/cmdlib/test.py
b/lib/cmdlib/test.py | ||
---|---|---|
33 | 33 |
from ganeti import utils |
34 | 34 |
from ganeti.masterd import iallocator |
35 | 35 |
from ganeti.cmdlib.base import NoHooksLU |
36 |
from ganeti.cmdlib.common import _ExpandInstanceName, _GetWantedNodes, \
|
|
37 |
_GetWantedInstances
|
|
36 |
from ganeti.cmdlib.common import ExpandInstanceName, GetWantedNodes, \
|
|
37 |
GetWantedInstances |
|
38 | 38 |
|
39 | 39 |
|
40 | 40 |
class LUTestDelay(NoHooksLU): |
... | ... | |
57 | 57 |
# _GetWantedNodes can be used here, but is not always appropriate to use |
58 | 58 |
# this way in ExpandNames. Check LogicalUnit.ExpandNames docstring for |
59 | 59 |
# more information. |
60 |
self.op.on_nodes = _GetWantedNodes(self, self.op.on_nodes)
|
|
60 |
self.op.on_nodes = GetWantedNodes(self, self.op.on_nodes) |
|
61 | 61 |
self.needed_locks[locking.LEVEL_NODE] = self.op.on_nodes |
62 | 62 |
|
63 | 63 |
def _TestDelay(self): |
... | ... | |
261 | 261 |
if self.op.hypervisor is None: |
262 | 262 |
self.op.hypervisor = self.cfg.GetHypervisorType() |
263 | 263 |
elif self.op.mode == constants.IALLOCATOR_MODE_RELOC: |
264 |
fname = _ExpandInstanceName(self.cfg, self.op.name)
|
|
264 |
fname = ExpandInstanceName(self.cfg, self.op.name) |
|
265 | 265 |
self.op.name = fname |
266 | 266 |
self.relocate_from = \ |
267 | 267 |
list(self.cfg.GetInstanceInfo(fname).secondary_nodes) |
... | ... | |
269 | 269 |
constants.IALLOCATOR_MODE_NODE_EVAC): |
270 | 270 |
if not self.op.instances: |
271 | 271 |
raise errors.OpPrereqError("Missing instances", errors.ECODE_INVAL) |
272 |
self.op.instances = _GetWantedInstances(self, self.op.instances)
|
|
272 |
self.op.instances = GetWantedInstances(self, self.op.instances) |
|
273 | 273 |
else: |
274 | 274 |
raise errors.OpPrereqError("Invalid test allocator mode '%s'" % |
275 | 275 |
self.op.mode, errors.ECODE_INVAL) |
Also available in: Unified diff