Revision 5eacbcae lib/cmdlib/base.py
b/lib/cmdlib/base.py | ||
---|---|---|
28 | 28 |
from ganeti import locking |
29 | 29 |
from ganeti import query |
30 | 30 |
from ganeti import utils |
31 |
from ganeti.cmdlib.common import _ExpandInstanceName
|
|
31 |
from ganeti.cmdlib.common import ExpandInstanceName |
|
32 | 32 |
|
33 | 33 |
|
34 | 34 |
class ResultWithJobs: |
... | ... | |
319 | 319 |
else: |
320 | 320 |
assert locking.LEVEL_INSTANCE not in self.needed_locks, \ |
321 | 321 |
"_ExpandAndLockInstance called with instance-level locks set" |
322 |
self.op.instance_name = _ExpandInstanceName(self.cfg,
|
|
323 |
self.op.instance_name)
|
|
322 |
self.op.instance_name = ExpandInstanceName(self.cfg, |
|
323 |
self.op.instance_name) |
|
324 | 324 |
self.needed_locks[locking.LEVEL_INSTANCE] = self.op.instance_name |
325 | 325 |
|
326 | 326 |
def _LockInstancesNodes(self, primary_only=False, |
... | ... | |
444 | 444 |
raise NotImplementedError |
445 | 445 |
|
446 | 446 |
|
447 |
class _QueryBase:
|
|
447 |
class QueryBase: |
|
448 | 448 |
"""Base for query utility classes. |
449 | 449 |
|
450 | 450 |
""" |
Also available in: Unified diff